aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2012-03-24 01:01:28 +0100
committerHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2012-03-24 01:01:28 +0100
commit2271d1247be11bb1236981b10c950cca99c07b36 (patch)
treea579bf83f8a754156c678da998b5260d1128bad9
parent01bcfd6aa8f1d16a07c54d8cc6ad21411080223d (diff)
parent7d51d7bf57abf207f70c2eb972402ca3c2e149ce (diff)
downloadBlueGPS-2271d1247be11bb1236981b10c950cca99c07b36.zip
BlueGPS-2271d1247be11bb1236981b10c950cca99c07b36.tar.gz
BlueGPS-2271d1247be11bb1236981b10c950cca99c07b36.tar.bz2
Merge branch 'BlueGPS4Droid_1.2.x' into BlueGPS4Cupcake_1.2.x
-rw-r--r--.gitignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3289aac..4f6ec07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-/bin/
+/bin
+/gen
#*.dex
#*.apk
-#resources.ap_ \ No newline at end of file
+#resources.ap_