From fd5fabb39e66c0335b86ccf218ca3d5b0df7b278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Demette?= Date: Wed, 13 Aug 2014 22:55:43 +0200 Subject: [PATCH 1/2] Typo fix + Plugin configuration + UI specific file --- Global/JetBrains.gitignore | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 333bdd26..311a7322 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -12,9 +12,13 @@ # .idea/dataSources.xml # .idea/sqlDataSources.xml # .idea/dynamic.xml -# and, if using gradle:: +# and this UI specific file +# .idea/uiDesigner.xml +# and, if using gradle: # .idea/gradle.xml # .idea/libraries +# and, if using Mongo Explorer plugin +# .idea/mongoSettings.xml ## File-based project format *.ipr @@ -30,4 +34,4 @@ out/ atlassian-ide-plugin.xml # generated by Crashlytics plugin (for Android Studio and Intellij) -com_crashlytics_export_strings.xml +com_crashlytics_export_strings.xml \ No newline at end of file From 57f117945e43e88651b766c548ee2fda7710f0a7 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Mon, 1 Sep 2014 14:56:15 +1000 Subject: [PATCH 2/2] Tidy up the JetBrains comments Amends #1165 --- Global/JetBrains.gitignore | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 311a7322..2ac36702 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,37 +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 this UI specific file # .idea/uiDesigner.xml -# and, if using gradle: + +# Gradle: # .idea/gradle.xml # .idea/libraries -# and, if using Mongo Explorer plugin + +# Mongo Explorer plugin: # .idea/mongoSettings.xml -## File-based project format +## 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) -com_crashlytics_export_strings.xml \ No newline at end of file +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml