From 61162f3f8a9481356aef03990f3e5e885e97bc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Sieradzki?= Date: Fri, 18 Jul 2014 20:27:55 +0200 Subject: [PATCH] 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