3 Commits

Author	SHA1	Message	Date
Daniel Albert	d63534d655	Merge remote-tracking branch 'upstream/master' ... Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java	2014-07-16 18:49:16 +02:00
Vincent Breitmoser	a9c3d6b507	Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test ... Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell	2014-07-09 16:39:26 +02:00
Vincent Breitmoser	718acbf954	put unit tests into external module (CAVEAT) ... this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling.	2014-07-09 16:03:30 +02:00