diff options
| author | Carl Suster <carl@contraflo.ws> | 2014-09-01 14:58:35 +1000 |
|---|---|---|
| committer | Carl Suster <carl@contraflo.ws> | 2014-09-01 14:58:35 +1000 |
| commit | 765ec99d49ce38e2961d9e2410d5a2fb476ea501 (patch) | |
| tree | 502d81c67d20e8964ca362e48ad77e57ab3176bb /Global | |
| parent | 2ad62f54238670d6d86a813302820cc76fbfb3bf (diff) | |
| parent | 57f117945e43e88651b766c548ee2fda7710f0a7 (diff) | |
| download | gitignore-765ec99d49ce38e2961d9e2410d5a2fb476ea501.tar.gz gitignore-765ec99d49ce38e2961d9e2410d5a2fb476ea501.zip | |
Merge branch 'fix-1165'
Diffstat (limited to 'Global')
| -rw-r--r-- | Global/JetBrains.gitignore | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 333bdd26..2ac36702 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,33 +1,44 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm -## Directory-based project format -.idea/ /*.iml -# if you remove the above rule, at least ignore user-specific stuff: + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the follwing: + +# User-specific stuff: # .idea/workspace.xml # .idea/tasks.xml # .idea/dictionaries -# and these sensitive or high-churn files: + +# Sensitive or high-churn files: # .idea/dataSources.ids # .idea/dataSources.xml # .idea/sqlDataSources.xml # .idea/dynamic.xml -# and, if using gradle:: +# .idea/uiDesigner.xml + +# Gradle: # .idea/gradle.xml # .idea/libraries -## File-based project format +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: *.ipr *.iws -## Additional for IntelliJ +## Plugin-specific files: + +# IntelliJ out/ -# generated by mpeltonen/sbt-idea plugin +# mpeltonen/sbt-idea plugin .idea_modules/ -# generated by JIRA plugin +# JIRA plugin atlassian-ide-plugin.xml -# generated by Crashlytics plugin (for Android Studio and Intellij) +# Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml |