From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitmodules (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..b5d82a48 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ics-openvpn"] + path = ics-openvpn + url = https://github.com/schwabe/ics-openvpn.git -- cgit v1.2.3 From 8b81657a9cb04fa29307f677747614f023576cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:31:53 +0200 Subject: ics-openvpn submodule now points to parmegv's repo That way we can publish the bitmask branch. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index b5d82a48..9d7b6f0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ics-openvpn"] path = ics-openvpn - url = https://github.com/schwabe/ics-openvpn.git + url = ssh://git@github.com:parmegv/ics-openvpn.git -- cgit v1.2.3 From ffb6d2fe8ddd69f0e7239fa9505dc255eed6b348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 20:17:43 +0200 Subject: Updated bitmask branch from ics-openvpn fork, second notification --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 9d7b6f0d..58bc41eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ics-openvpn"] path = ics-openvpn - url = ssh://git@github.com:parmegv/ics-openvpn.git + url = git@github.com:parmegv/ics-openvpn.git -- cgit v1.2.3 From 0b396ae4232a22cec67b21851ee2f4c374a94a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 23:05:34 +0200 Subject: Try to track "bitmask" branch from ics-openvpn fork --- .gitmodules | 1 + 1 file changed, 1 insertion(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 58bc41eb..8bd0f9d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "ics-openvpn"] path = ics-openvpn + branch = bitmask url = git@github.com:parmegv/ics-openvpn.git -- cgit v1.2.3