Daniel Albert c101ee0240 Merge remote-tracking branch 'upstream/master' into feature-conceal-software		2014-07-13 15:39:16 +02:00
..
assets	remove leftover of AndroidBootstrap	2014-06-30 22:05:02 +02:00
java	Merge remote-tracking branch 'upstream/master' into feature-conceal-software	2014-07-13 15:39:16 +02:00
res	Merge remote-tracking branch 'upstream/master' into feature-conceal-software	2014-07-13 15:39:16 +02:00
AndroidManifest.xml	Remove old edit button, rename activities	2014-07-03 16:21:16 +02:00