Vincent Breitmoser 30d0afa363 change the way merging is logged

2014-10-25 02:45:16 +02:00

..

assets

remove leftover of AndroidBootstrap

2014-06-30 22:05:02 +02:00

java

change the way merging is logged

2014-10-25 02:45:16 +02:00

res

change the way merging is logged

2014-10-25 02:45:16 +02:00

AndroidManifest.xml

Externalize QR Code scanning and import into its own activity for better code separation

2014-10-23 17:13:49 +02:00