Merge pull request #831 from arcresu/idea

Consolidate various IDE tempates into Global/JetBrains template

Android.gitignore

@@ -21,9 +21,3 @@ local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/

Global/IntelliJ.gitignore

@@ -1,5 +0,0 @@
-*.iml
-*.ipr
-*.iws
-.idea/
-out/

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/

Global/PhPStorm.gitignore

@@ -1 +0,0 @@
-.idea/

Global/PyCharm.gitignore

@@ -1,4 +0,0 @@
-# PyCharm
-# http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
-.iml

Global/RubyMine.gitignore

@@ -1 +0,0 @@
-.idea/workspace.xml

Objective-C.gitignore

@@ -16,7 +16,6 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
 *.xccheckout