diff --git a/Android.gitignore b/Android.gitignore index 648a292a..0f757f48 100644 --- 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 deleted file mode 100644 index 7576fded..00000000 --- a/Global/IntelliJ.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.iml -*.ipr -*.iws -.idea/ -out/ diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore new file mode 100644 index 00000000..9f20c505 --- /dev/null +++ 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 deleted file mode 100644 index 9f11b755..00000000 --- a/Global/PhPStorm.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea/ diff --git a/Global/PyCharm.gitignore b/Global/PyCharm.gitignore deleted file mode 100644 index 57272810..00000000 --- a/Global/PyCharm.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# PyCharm -# http://www.jetbrains.com/pycharm/webhelp/project.html -.idea -.iml diff --git a/Global/RubyMine.gitignore b/Global/RubyMine.gitignore deleted file mode 100644 index 1cc4572e..00000000 --- a/Global/RubyMine.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea/workspace.xml diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 8dcee63e..af228cde 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -16,7 +16,6 @@ xcuserdata profile *.moved-aside DerivedData -.idea/ *.hmap *.xccheckout