Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -0/+2 |
|\ | |||||
| * | Import R and BuildConfig explicitly | Thialfihar | 2015-06-26 | 1 | -0/+2 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 19 | -0/+5517 |
| |\ | |||||
* | \ | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 19 | -0/+5529 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Add missing WorkaroundBuildConfig | Dominik Schürmann | 2015-06-11 | 1 | -0/+14 |
| | | |||||
| * | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 13 | -13/+26 |
| | | |||||
| * | Use new officially supported way for local unit tests, many dependencies ↵ | Dominik Schürmann | 2015-06-11 | 18 | -0/+5490 |
|/ | | | | upgraded for this, temporary disabled separate debug builds | ||||
* | update unit test support in build files | Vincent Breitmoser | 2014-05-27 | 2 | -69/+0 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 2 | -0/+69 |