summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-06-20 18:36:16 -0600
committerSean Leonard <meanderingcode@aetherislands.net>2013-06-20 18:36:16 -0600
commit195d5ab2d518f6f3960edd3c636e941830c2664d (patch)
tree81b6b0d0e0b374e82afa6fc15c32716f981f0aa4 /.gitignore
parent5a7e2365365a3b1f773212cefdeeaa4ee587a590 (diff)
parent3f8e2f6569f893a49bf1819416cae792c702d370 (diff)
Merge 'parmegv/feature/authGui' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 11526f8..9aa5a03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
obj
bin
gen
+libs
openvpn/.git
openvpn/autom4te.cache
openvpn/aclocal.m4
@@ -65,3 +66,6 @@ id.zip
/hosts-for-android-emulator.bk
/build-native.sh.bk
/build-native.sh~
+
+build.gradle
+local.properties