diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
| commit | a4b7daf266b037c6a39cef0586aadedf32861ad5 (patch) | |
| tree | 8446f6aae86530a8546caa99af6f9bac4f095370 /OpenKeychain/src/main/res/raw-ja/help_about.html | |
| parent | d27925ad19b6800658a69670ceaed261776ba6d3 (diff) | |
| parent | dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c (diff) | |
| download | open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.gz open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.bz2 open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-ja/help_about.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-ja/help_about.html | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/OpenKeychain/src/main/res/raw-ja/help_about.html b/OpenKeychain/src/main/res/raw-ja/help_about.html deleted file mode 100644 index 77c774cf6..000000000 --- a/OpenKeychain/src/main/res/raw-ja/help_about.html +++ /dev/null @@ -1,61 +0,0 @@ -<html> -<head></head> -<body> -<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p> -<p><a href="http://www.openkeychain.org">OpenKeychain</a> は Android における OpenPGP 実装です。</p> -<p>ライセンス: GPLv3以降</p> - -<h2>開発者</h2> -<ul> -<li>Dominik Schürmann (メンテナ)</li> -<li>Art O Cathain</li> -<li>Ash Hughes</li> -<li>Brian C. Barnes</li> -<li>Bahtiar 'kalkin' Gadimov</li> -<li>Daniel Albert</li> -<li>Daniel Hammann</li> -<li>Daniel Haß</li> -<li>Greg Witczak</li> -<li>'mar-v-in'</li> -<li>Markus Doits</li> -<li>Miroojin Bakshi</li> -<li>Nikhil Peter Raj</li> -<li>Paul Sarbinowski</li> -<li>'Senecaso'</li> -<li>Signe Rüsch</li> -<li>Sreeram Boyapati</li> -<li>Thialfihar (APG 1.x)</li> -<li>Tim Bray</li> -<li>Vincent Breitmoser</li> -</ul> -<h2>ライブラリ</h2> -<ul> -<li> -<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> -<li> -<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li> -<li> -<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li> -<li> -<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li> -<li> -<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li> -<li> -<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li> -<li> -<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> -<li> -<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li> -<li> -<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li> -<li> -<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li> -<li> -<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li> -<li> -<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li> -<li> -<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li> -</ul> -</body> -</html> |