Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development

Browse Source

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml

...

This commit is contained in:

Dominik Schürmann

2015-03-04 20:54:11 +01:00

parent e312b0e675 024ba19499

commit bb2d80bfc8

8 changed files with 225 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_save_white.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 362 B