Merge "Update AAI version numbers in java manifest" into beijing

[integration.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f3b07b8..209db72 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea/
 .project
 .classpath
 .settings/
@@ -18,3 +19,6 @@ env.properties
 .vagrant
 *~
 .checkstyle
+.DS_Store
+devtool/
+seccom/