Merge git ignore changes.

Conflicts: example/example.iml library/library.iml
TonicArtos · Apr 22, 2015 · b6b50c5 · b6b50c5
2 parents 787d550 + 880a617
commit b6b50c5
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 504 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,11 @@
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+#/.idea/workspace.xml
+#/.idea/libraries
 .DS_Store
-/build
-.idea/vcs.xml
+#.idea/vcs.xml
+
+.idea/
+.gradle
+build/
+*.iml
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
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/dictionaries/tonic.xml b/.idea/dictionaries/tonic.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/SuperSLiM.iml b/SuperSLiM.iml