Upgrade tinc to 1.0.25.

Vilbrekin · Jan 15, 2015 · 5ed90a2 · 5ed90a2
1 parent 22d0378
commit 5ed90a2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -78,7 +78,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="org.poirsouille.tinc_gui"
-    android:versionCode="13"
-    android:versionName="0.9.12" >
+    android:versionCode="14"
+    android:versionName="0.9.13" >
 
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />

diff --git a/app/src/main/jni/config.h b/app/src/main/jni/config.h
@@ -409,7 +409,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.0.24"
+#define VERSION "1.0.25"
 
 /* Compile with support for Windows 2000 */
 /* #undef WITH_WINDOWS2000 */

diff --git a/tinc b/tinc