Merge pull request #831 from arcresu/idea

Consolidate various IDE tempates into Global/JetBrains template
This commit is contained in:
Adam Roben 2013-11-11 05:25:58 -08:00
commit 2fea1b6b92
7 changed files with 20 additions and 18 deletions

View File

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

View File

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

View File

@ -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/

View File

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

View File

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

View File

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

View File

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