aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDominik <dominik@dominikschuermann.de>2012-03-09 12:13:28 +0100
committerDominik <dominik@dominikschuermann.de>2012-03-09 12:13:28 +0100
commit7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9 (patch)
tree1e85e6dfd94259656e5c03513f3089e76185b262 /.gitignore
parent781f089ee1730f596015145706f2302218efeaed (diff)
downloadopen-keychain-7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9.tar.gz
open-keychain-7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9.tar.bz2
open-keychain-7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9.zip
fixing qrcode integration
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore25
1 files changed, 21 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 8642510bb..2e423e1a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
-bin/
-gen/
-.classpath
+#Android generated
+bin
+gen
+obj
+libs/armeabi
+lint.xml
+local.properties
+
+#Eclipse
.project
-.DS_Store
+.classpath
.settings
+
+#IntelliJ IDEA
+.idea
+*.iml
+
+#Maven
+target
+release.properties
+
+#Mac
+.DS_Store \ No newline at end of file