Black coffee
Bild
vcs
Merge branch 'master' of /Users/richard/Dropbox/git/Min musikapp

Conflicts:
	.idea/workspace.xml
Black coffee inkopplad
Börja spela direkt om BT på
DI.FM
Spara senaste station (in progress)
xx
:
Merge branch 'master' of /Users/richard/Dropbox/git/Min musikapp

Conflicts:
	.idea/workspace.xml
	src/se/amphisys/musikapp/MainActivity.java
Tar bort skräp
Merge branch 'master' of /Users/richard/Dropbox/git/Min musikapp

Conflicts:
	.idea/workspace.xml
	out/production/Min_musikapp/Min_musikapp.apk
	out/production/Min_musikapp/Min_musikapp.unaligned.apk
	out/production/Min_musikapp/se/amphisys/musikapp/R$drawable.class
	out/production/Min_musikapp/se/amphisys/musikapp/R$id.class
	out/production/Min_musikapp/se/amphisys/musikapp/R$layout.class
	out/production/Min_musikapp/se/amphisys/musikapp/R$string.class
	out/production/Min_musikapp/se/amphisys/musikapp/R.class
Merge branch 'master' of /Users/richard/Dropbox/git/Min musikapp

Conflicts:
	.idea/workspace.xml
	src/se/amphisys/musikapp/MainActivity.java
Merge branch 'master' of /Users/richard/Dropbox/git/Min musikapp

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
Buggfix
Tar bort workspace
Fix för att komma ihåg senaste stationen
Maven
Tester med robolectric
Fixar