Merge pull request #46 from g-ortuno/ignore-ide-files

Ignore IDE files
WebBluetoothCG · Jul 16, 2015 · 569b05c · 569b05c
2 parents 60cb3ef + 5ba7ed0
commit 569b05c
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 219 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,8 +26,10 @@ proguard/
 *.log
 
 # Idea files
-/.idea/workspace.xml
-/.idea/libraries
+/.idea/
+
+# iml files
+*.iml
 
 # Mac Files
 .DS_Store
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/app.iml b/app/app.iml
diff --git a/ble-test-peripheral-android.iml b/ble-test-peripheral-android.iml