diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-16 21:55:02 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-16 21:55:02 +0100 |
| commit | 4f0061293e1d8e90d2828deeb6b72d8a2c8bd509 (patch) | |
| tree | a365b75f1d8cd49639b0e6b597aeb48ea82b1773 /libs/3rdParty | |
| parent | f49b979cbe96a81c7f20f209bec7e5a1c9f3c24f (diff) | |
| parent | c26335f3e366110366eb89025a42875bcb7840a9 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to '')
| -rw-r--r-- | libs/3rdParty/EnhancedListView-0.3.4.aar | bin | 0 -> 40155 bytes |
| -rw-r--r-- | libs/3rdParty/ShortcutBadger-1.1.1.aar | bin | 0 -> 16916 bytes |
| -rw-r--r-- | libs/3rdParty/bcprov-jdk15on-1.51.jar (renamed from libs/bcprov-jdk15on-1.50.jar) | bin | 2732684 -> 2842667 bytes |
| -rw-r--r-- | libs/3rdParty/libidn-1.15.jar (renamed from libs/libidn-1.15.jar) | bin | 111731 -> 111731 bytes |
| -rw-r--r-- | libs/3rdParty/minidns-0.1.3.jar | bin | 0 -> 31043 bytes |
| -rw-r--r-- | libs/3rdParty/org.otr4j-0.22.jar | bin | 0 -> 105376 bytes |
| -rw-r--r-- | libs/3rdParty/swipy-1.2.1.aar | bin | 0 -> 48375 bytes |
| -rw-r--r-- | libs/3rdParty/zxing/android-core-3.1.0.jar (renamed from libs/zxing/android-core-3.1.0.jar) | bin | 11415 -> 11415 bytes |
| -rw-r--r-- | libs/3rdParty/zxing/android-integration-3.1.0.jar (renamed from libs/zxing/android-integration-3.1.0.jar) | bin | 11171 -> 11171 bytes |
| -rw-r--r-- | libs/3rdParty/zxing/core-3.1.0.jar (renamed from libs/zxing/core-3.1.0.jar) | bin | 538421 -> 538421 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/libs/3rdParty/EnhancedListView-0.3.4.aar b/libs/3rdParty/EnhancedListView-0.3.4.aar Binary files differnew file mode 100644 index 00000000..1d649e4f --- /dev/null +++ b/libs/3rdParty/EnhancedListView-0.3.4.aar diff --git a/libs/3rdParty/ShortcutBadger-1.1.1.aar b/libs/3rdParty/ShortcutBadger-1.1.1.aar Binary files differnew file mode 100644 index 00000000..becd4961 --- /dev/null +++ b/libs/3rdParty/ShortcutBadger-1.1.1.aar diff --git a/libs/bcprov-jdk15on-1.50.jar b/libs/3rdParty/bcprov-jdk15on-1.51.jar Binary files differindex d4b510d7..4076e116 100644 --- a/libs/bcprov-jdk15on-1.50.jar +++ b/libs/3rdParty/bcprov-jdk15on-1.51.jar diff --git a/libs/libidn-1.15.jar b/libs/3rdParty/libidn-1.15.jar Binary files differindex 79a44f92..79a44f92 100644 --- a/libs/libidn-1.15.jar +++ b/libs/3rdParty/libidn-1.15.jar diff --git a/libs/3rdParty/minidns-0.1.3.jar b/libs/3rdParty/minidns-0.1.3.jar Binary files differnew file mode 100644 index 00000000..d8e74660 --- /dev/null +++ b/libs/3rdParty/minidns-0.1.3.jar diff --git a/libs/3rdParty/org.otr4j-0.22.jar b/libs/3rdParty/org.otr4j-0.22.jar Binary files differnew file mode 100644 index 00000000..f217db1d --- /dev/null +++ b/libs/3rdParty/org.otr4j-0.22.jar diff --git a/libs/3rdParty/swipy-1.2.1.aar b/libs/3rdParty/swipy-1.2.1.aar Binary files differnew file mode 100644 index 00000000..428e97db --- /dev/null +++ b/libs/3rdParty/swipy-1.2.1.aar diff --git a/libs/zxing/android-core-3.1.0.jar b/libs/3rdParty/zxing/android-core-3.1.0.jar Binary files differindex 0c6137de..0c6137de 100644 --- a/libs/zxing/android-core-3.1.0.jar +++ b/libs/3rdParty/zxing/android-core-3.1.0.jar diff --git a/libs/zxing/android-integration-3.1.0.jar b/libs/3rdParty/zxing/android-integration-3.1.0.jar Binary files differindex fb621f8b..fb621f8b 100644 --- a/libs/zxing/android-integration-3.1.0.jar +++ b/libs/3rdParty/zxing/android-integration-3.1.0.jar diff --git a/libs/zxing/core-3.1.0.jar b/libs/3rdParty/zxing/core-3.1.0.jar Binary files differindex 63c228a9..63c228a9 100644 --- a/libs/zxing/core-3.1.0.jar +++ b/libs/3rdParty/zxing/core-3.1.0.jar |