From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 8 Apr 2014 12:04:17 +0200
Subject: Rename app->bitmask_android

This way, gradle commands generate apks correctly named.
---
 app/openvpn/.gitignore | 56 --------------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 app/openvpn/.gitignore

(limited to 'app/openvpn/.gitignore')

diff --git a/app/openvpn/.gitignore b/app/openvpn/.gitignore
deleted file mode 100644
index a04afff7..00000000
--- a/app/openvpn/.gitignore
+++ /dev/null
@@ -1,56 +0,0 @@
-*.[oa]
-*.l[oa]
-*.dll
-*.exe
-*.exe.*
-*.obj
-*.pyc
-*.so
-*~
-*.idb
-*.suo
-*.ncb
-*.vcproj.*
-*.vcxproj.user
-*.sln.cache
-*.log
-Release
-Debug
-Win32-Output
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autodefs.h
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-configure.h
-depcomp
-stamp-h1
-install-sh
-missing
-ltmain.sh
-libtool
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-
-version.sh
-msvc-env-local.bat
-config-msvc-local.h
-config-msvc-version.h
-doc/openvpn.8.html
-distro/rpm/openvpn.spec
-tests/t_client.sh
-tests/t_client-*-20??????-??????/
-src/openvpn/openvpn
-config-version.h
-- 
cgit v1.2.3


From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 16:03:55 +0200
Subject: Back to the standard "app" module.

This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure
I'll have to tweak the final apk name in build.gradle.
---
 app/openvpn/.gitignore | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 app/openvpn/.gitignore

(limited to 'app/openvpn/.gitignore')

diff --git a/app/openvpn/.gitignore b/app/openvpn/.gitignore
new file mode 100644
index 00000000..a04afff7
--- /dev/null
+++ b/app/openvpn/.gitignore
@@ -0,0 +1,56 @@
+*.[oa]
+*.l[oa]
+*.dll
+*.exe
+*.exe.*
+*.obj
+*.pyc
+*.so
+*~
+*.idb
+*.suo
+*.ncb
+*.vcproj.*
+*.vcxproj.user
+*.sln.cache
+*.log
+Release
+Debug
+Win32-Output
+.deps
+.libs
+Makefile
+Makefile.in
+aclocal.m4
+autodefs.h
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.h
+depcomp
+stamp-h1
+install-sh
+missing
+ltmain.sh
+libtool
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
+version.sh
+msvc-env-local.bat
+config-msvc-local.h
+config-msvc-version.h
+doc/openvpn.8.html
+distro/rpm/openvpn.spec
+tests/t_client.sh
+tests/t_client-*-20??????-??????/
+src/openvpn/openvpn
+config-version.h
-- 
cgit v1.2.3


From 67df6c575a86d5f9d42cbcd6a9ff66ca5d783f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 23:42:12 +0200
Subject: config.h needed by ndk-build

---
 app/openvpn/.gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/openvpn/.gitignore')

diff --git a/app/openvpn/.gitignore b/app/openvpn/.gitignore
index a04afff7..6a69be43 100644
--- a/app/openvpn/.gitignore
+++ b/app/openvpn/.gitignore
@@ -25,7 +25,6 @@ aclocal.m4
 autodefs.h
 autom4te.cache
 config.guess
-config.h
 config.h.in
 config.log
 config.status
-- 
cgit v1.2.3