summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-07-26 15:30:24 -0600
committerSean Leonard <meanderingcode@aetherislands.net>2013-07-26 15:30:24 -0600
commitf49967fb3f24bf0a22d09b5823bd174a45e758f7 (patch)
tree7fefe9ec3aeff998c5dd99861428717a2c5f3a41 /.gitignore
parent8dbb4517b07c42c3b37b0764d63973b5b1ed5ee6 (diff)
parentb69c9a87f60e649221c8f83d58bbd57b35a64aca (diff)
Merge branch 'release-0.2.0'0.2.0
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 0ceda544..9aa5a039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
obj
bin
-libs
gen
+libs
openvpn/.git
openvpn/autom4te.cache
openvpn/aclocal.m4
@@ -63,3 +63,9 @@ zh-CN.zip
zh-TW.zip
google-breakpad/
id.zip
+/hosts-for-android-emulator.bk
+/build-native.sh.bk
+/build-native.sh~
+
+build.gradle
+local.properties