danielnelz 704821a8db Merge remote-tracking branch 'upstream/development' into development		2015-03-09 20:25:03 +01:00
..
assets	remove leftover of AndroidBootstrap	2014-06-30 22:05:02 +02:00
java	Merge remote-tracking branch 'upstream/development' into development	2015-03-09 20:25:03 +01:00
res	Some fixes for delete after encryption	2015-03-09 18:59:15 +01:00
AndroidManifest.xml	Update patternview lib, remove workaround	2015-03-03 15:56:03 +01:00