aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Zur <tristan.zur@ccwn.org>2015-01-11 02:39:39 +0100
committerTristan Zur <tristan.zur@ccwn.org>2015-01-11 02:39:39 +0100
commite8ca2a1ae3259c66991f69d62c470ca611ee4659 (patch)
treeec743af03426e3beda883a015076c55cf1ff7117
parent5a860416b502833b445f10cea004735910ef0986 (diff)
parent71bb1e90b0656fe5caa32b34cb5798855d6cc425 (diff)
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts: src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
-rw-r--r--libs/bcprov-jdk15on-1.50.jarbin0 -> 2732684 bytes
-rw-r--r--libs/libidn-1.15.jarbin0 -> 111731 bytes
-rw-r--r--libs/minidns/AndroidManifest.xml13
-rw-r--r--libs/minidns/lint.xml3
-rw-r--r--libs/minidns/project.properties14
-rw-r--r--libs/otr4j-0.21.jarbin0 -> 95763 bytes
-rw-r--r--libs/zxing/android-core-3.1.0.jarbin0 -> 11415 bytes
-rw-r--r--libs/zxing/android-integration-3.1.0.jarbin0 -> 11171 bytes
-rw-r--r--libs/zxing/core-3.1.0.jarbin0 -> 538421 bytes
-rw-r--r--src/main/.project33
-rw-r--r--src/main/project.properties14
11 files changed, 77 insertions, 0 deletions
diff --git a/libs/bcprov-jdk15on-1.50.jar b/libs/bcprov-jdk15on-1.50.jar
new file mode 100644
index 00000000..d4b510d7
--- /dev/null
+++ b/libs/bcprov-jdk15on-1.50.jar
Binary files differ
diff --git a/libs/libidn-1.15.jar b/libs/libidn-1.15.jar
new file mode 100644
index 00000000..79a44f92
--- /dev/null
+++ b/libs/libidn-1.15.jar
Binary files differ
diff --git a/libs/minidns/AndroidManifest.xml b/libs/minidns/AndroidManifest.xml
new file mode 100644
index 00000000..6c9477d9
--- /dev/null
+++ b/libs/minidns/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="de.measite.minidns"
+ android:versionCode="1"
+ android:versionName="1.0" >
+
+ <uses-sdk
+ android:minSdkVersion="9"
+ android:targetSdkVersion="19" />
+
+ <application/>
+
+</manifest>
diff --git a/libs/minidns/lint.xml b/libs/minidns/lint.xml
new file mode 100644
index 00000000..ee0eead5
--- /dev/null
+++ b/libs/minidns/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint> \ No newline at end of file
diff --git a/libs/minidns/project.properties b/libs/minidns/project.properties
new file mode 100644
index 00000000..4ab12569
--- /dev/null
+++ b/libs/minidns/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19
diff --git a/libs/otr4j-0.21.jar b/libs/otr4j-0.21.jar
new file mode 100644
index 00000000..85bc69e6
--- /dev/null
+++ b/libs/otr4j-0.21.jar
Binary files differ
diff --git a/libs/zxing/android-core-3.1.0.jar b/libs/zxing/android-core-3.1.0.jar
new file mode 100644
index 00000000..0c6137de
--- /dev/null
+++ b/libs/zxing/android-core-3.1.0.jar
Binary files differ
diff --git a/libs/zxing/android-integration-3.1.0.jar b/libs/zxing/android-integration-3.1.0.jar
new file mode 100644
index 00000000..fb621f8b
--- /dev/null
+++ b/libs/zxing/android-integration-3.1.0.jar
Binary files differ
diff --git a/libs/zxing/core-3.1.0.jar b/libs/zxing/core-3.1.0.jar
new file mode 100644
index 00000000..63c228a9
--- /dev/null
+++ b/libs/zxing/core-3.1.0.jar
Binary files differ
diff --git a/src/main/.project b/src/main/.project
new file mode 100644
index 00000000..d2f05ef9
--- /dev/null
+++ b/src/main/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ConversationActivity</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/src/main/project.properties b/src/main/project.properties
new file mode 100644
index 00000000..4ab12569
--- /dev/null
+++ b/src/main/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19