From 61162f3f8a9481356aef03990f3e5e885e97bc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Sieradzki?= <milosz+github@sieradzki.it>
Date: Fri, 18 Jul 2014 20:27:55 +0200
Subject: [PATCH 1/2] Update submodule netcipher, setup tracking branch
 'master'

Make use of git >= 1.8.2 feature to track submodule brach and allow easy updates by

    git submodule update --remote

More info: http://www.vogella.com/tutorials/Git/article.html#submodules
---
 .gitmodules        | 1 +
 external/netcipher | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index eb47d8e..e37a6d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "external/netcipher"]
 	path = external/netcipher
 	url = https://github.com/guardianproject/NetCipher.git
+	branch = master
diff --git a/external/netcipher b/external/netcipher
index ba9d136..7f09f5b 160000
--- a/external/netcipher
+++ b/external/netcipher
@@ -1 +1 @@
-Subproject commit ba9d13676669f7ef32df43a023a4d4a33385e013
+Subproject commit 7f09f5b8a6b7155ba60a7299cb46ee3df92945fe

From 98bdca6bd48b362bfd525e388dc42edf9824552d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Sieradzki?= <milosz+github@sieradzki.it>
Date: Fri, 18 Jul 2014 20:31:16 +0200
Subject: [PATCH 2/2] Update setup-ant.sh

libs/android-support-v4.jar file was removed in commit a9b36df80e5f43159a7d612fec04cc00681a4b17
---
 setup-ant.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setup-ant.sh b/setup-ant.sh
index d5d6414..2a0965e 100755
--- a/setup-ant.sh
+++ b/setup-ant.sh
@@ -8,6 +8,3 @@ projectdir=`dirname $f`
     android update lib-project -p $projectdir -t $target
 done
 android update project -p . --subprojects -t $target --name Lightning
-
-cp libs/android-support-v4.jar external/netcipher/libnetcipher/libs/android-support-v4.jar
-