Project Share Start
test
test commit
testcommit für maxim :)
test
gooooooogleeeee
Merge branch 'master' of https://github.com/MiaAndroid/freeness_repository_B.git
rfevrg
Merge branch 'master' of
https://github.com/MiaAndroid/freeness_repository_B.git

Conflicts:
	bin/R.txt
	res/drawable/pic1.jpg
	res/drawable/pic2.jpg
	res/drawable/pic3.jpg
	res/drawable/pic4.jpg
	res/drawable/pic5.jpg
	res/drawable/pic6.jpg
	res/drawable/pic7.jpg
	res/drawable/pic8.jpg
	res/drawable/pic9.jpg
	res/layout/activity_main.xml
	res/values/strings.xml
	src/de/mia/list/CustomAdapter.java
	src/de/mia/list/FreenessMap.java
	src/de/mia/list/ListActivity.java
	src/de/mia/list/ListItemVideoActivity.java
	src/de/mia/list/ListModel.java
	src/de/mia/list/MainActivity.java