diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
| commit | e10cbc54c606563b2d06f083bca17119ca585127 (patch) | |
| tree | 23c71e67b1c4a381997bdb75de476f05d7dcec5f /Resources/graphics/originals/ic_launcher/AUTHORS | |
| parent | bef3e621118d0e4d8fadedf0c9d67b6a9ff41883 (diff) | |
| parent | acbf2a18617eea73924dd109e09189420d9876fe (diff) | |
| download | open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.gz open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.bz2 open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Diffstat (limited to 'Resources/graphics/originals/ic_launcher/AUTHORS')
| -rw-r--r-- | Resources/graphics/originals/ic_launcher/AUTHORS | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Resources/graphics/originals/ic_launcher/AUTHORS b/Resources/graphics/originals/ic_launcher/AUTHORS new file mode 100644 index 000000000..dbfcfb4fc --- /dev/null +++ b/Resources/graphics/originals/ic_launcher/AUTHORS @@ -0,0 +1,21 @@ +Oxygen for KDE3 +Oxygen Icon Theme has been developed by The Oxygen Team. + +Art Director: +David Vignoni <david@oxygen-icons.org> + +Designers: +David J. Miller <miller@oxygen-icons.org> +David Vignoni <david@oxygen-icons.org> +Johann Ollivier Lapeyre <johann@oxygen-icons.org> +Kenneth Wimer <ken@oxygen-icons.org> +Nuno F. Pinheiro <nuno@oxygen-icons.org> +Riccardo Iaconelli <riccardo@oxygen-icons.org> + +Thanks to: +Lee Olson: Contributed drawing used in application-x-bittorent icon. +Marco Aurélio "Coré": Improved audio-input-microphone icon. +Matthias Kretz: Contributed "audio-input-line" device icon. +Mauricio Piacentini <piacentini@kde.org> : game icons mashup + +Repackaged by Luke Channings <thefuzzball2005@gmail.com>
\ No newline at end of file |