diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
| commit | 4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch) | |
| tree | 63a051fb595d168f8ddbfd76a51bb2319889d40b /OpenKeychain/src/main/res/raw-sr/help_about.html | |
| parent | ba7d8a58673d55660bc7faf68970229f17458514 (diff) | |
| parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
| download | open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2 open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-sr/help_about.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-sr/help_about.html | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/raw-sr/help_about.html b/OpenKeychain/src/main/res/raw-sr/help_about.html index a2ad13d25..0d2f9d697 100644 --- a/OpenKeychain/src/main/res/raw-sr/help_about.html +++ b/OpenKeychain/src/main/res/raw-sr/help_about.html @@ -31,27 +31,31 @@ <h2>Библиотеке</h2> <ul> <li> -<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Апачи лиценца в2)</li> +<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (МИТ Икс11 лиценца)</li> +<li> +<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (МИТ лиценца)</li> <li> -<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Апачи лиценца в2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Андроидове библиотеке подршке</a> (Апачи лиценца в2)</li> <li> <a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Апачи лиценца в2)</li> <li> -<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Апачи лиценца в2)</li> -<li> <a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Апачи лиценца в2)</li> <li> <a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Апачи лиценца в2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Апачи лиценца в2)</li> <li> -<a href="http://code.google.com/p/zxing/">ZXing</a> (Апачи лиценца в2)</li> +<a href="https://github.com/zxing/zxing">ZXing</a> (Апачи лиценца в2)</li> <li> -<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (МИТ Икс11 лиценца)</li> +<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Апачи лиценца в2)</li> <li> -<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Апачи лиценца в2)</li> +<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Материјални дизајн)</a> (Апачи лиценца в2)</li> <li> -<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (МИТ лиценца)</li> +<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Апачи лиценца в2)</li> +<li> +<a href="https://github.com/nispok/snackbar">Snackbar</a> (МИТ лиценца)</li> +<li> +<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Апачи лиценца в2)</li> </ul> </body> </html> |