diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
| commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
| tree | d83d41d3c424a784da144515665fb41ef650aa52 /Graphics/get-material-icons.sh | |
| parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
| parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
| download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip | |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'Graphics/get-material-icons.sh')
| -rwxr-xr-x | Graphics/get-material-icons.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 758ddc8aa..67370afc2 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -9,6 +9,7 @@ python copy OpenKeychain navigation black expand_more 24 python copy OpenKeychain navigation white refresh 24 python copy OpenKeychain av white repeat 24 python copy OpenKeychain av grey repeat 24 +python copy OpenKeychain av black repeat 24 python copy OpenKeychain editor white mode_edit 24 python copy OpenKeychain content white save 24 python copy OpenKeychain navigation black close 24 @@ -63,3 +64,10 @@ python copy OpenKeychain action white delete 24 # yubikey dialog python copy OpenKeychain action black check_circle 48 + +# preference header +python copy OpenKeychain file black cloud 24 # cloud +python copy OpenKeychain action black lock 24 # password settings +python copy OpenKeychain action black settings_ethernet 24 # proxy +python copy OpenKeychain notification black sync 24 # sync +python copy OpenKeychain action black extension 24 # experimental |