Merge pull request github#831 from arcresu/idea

Consolidate various IDE tempates into Global/JetBrains template
Won-gyu · Nov 11, 2013 · 2fea1b6 · 2fea1b6
2 parents 9463c86 + 4f659df
commit 2fea1b6
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/Android.gitignore b/Android.gitignore
@@ -21,9 +21,3 @@ local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
diff --git a/Global/IntelliJ.gitignore b/Global/IntelliJ.gitignore
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
@@ -0,0 +1,20 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+
+## Directory-based project format
+.idea/
+# if you remove the above rule, at least ignore user-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# and these sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/
diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore
diff --git a/Global/PyCharm.gitignore b/Global/PyCharm.gitignore
diff --git a/Global/RubyMine.gitignore b/Global/RubyMine.gitignore
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -16,7 +16,6 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
 *.xccheckout
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ xcuserdata @@
     profile
     *.moved-aside
     DerivedData
-    .idea/
     *.hmap
     *.xccheckout
@@ Expand Down @@