Vincent Breitmoser cfa2ecca61 WIP! Merge branch 'v/eventbus' into v/multi-decrypt ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java

2015-06-07 00:05:14 +02:00

..

assets

remove leftover of AndroidBootstrap

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

java

WIP! Merge branch 'v/eventbus' into v/multi-decrypt

2015-06-07 00:05:14 +02:00

res

WIP! Merge branch 'v/eventbus' into v/multi-decrypt

2015-06-07 00:05:14 +02:00

AndroidManifest.xml

eventbus: initial attempt, replace messenger hack with eventbus communication

2015-06-06 23:17:42 +02:00