From 5ed90a2a4cc5253fcd76fb7d1ef871e6b167e118 Mon Sep 17 00:00:00 2001
From: Vilbrekin <vilbrekin@gmail.com>
Date: Thu, 15 Jan 2015 00:51:59 +0100
Subject: [PATCH] Upgrade tinc to 1.0.25.

---
 app/app.iml                      | 1 -
 app/src/main/AndroidManifest.xml | 4 ++--
 app/src/main/jni/config.h        | 2 +-
 tinc                             | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 8331f24..b130464 100644
--- 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
index 55ce739..a3d959d 100644
--- 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
index 33755b3..d569698 100644
--- 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
index 110ca19..b44ecdb 160000
--- a/tinc
+++ b/tinc
@@ -1 +1 @@
-Subproject commit 110ca1958af2465e383b4ca20b67fd0e780f3fb5
+Subproject commit b44ecdb27f716a32c5ac6304ea69369c779945e9