Vincent Breitmoser 29145e49c9 merge: different msg if nothing was merged		2014-07-15 19:17:08 +02:00
..
assets	remove leftover of AndroidBootstrap	2014-06-30 22:05:02 +02:00
java	merge: different msg if nothing was merged	2014-07-15 19:17:08 +02:00
res	merge: different msg if nothing was merged	2014-07-15 19:17:08 +02:00
AndroidManifest.xml	Remove old edit button, rename activities	2014-07-03 16:21:16 +02:00