Merge branch 'master' of https://github.com/github/gitignore

Global/JetBrains.gitignore

@@ -1,29 +1,44 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
 
-## Directory-based project format
+/*.iml
+
+## Directory-based project format:
 .idea/
-# if you remove the above rule, at least ignore user-specific stuff:
+# if you remove the above rule, at least ignore the follwing:
+
+# User-specific stuff:
 # .idea/workspace.xml
 # .idea/tasks.xml
-# and these sensitive or high-churn files:
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
 # .idea/dataSources.ids
 # .idea/dataSources.xml
 # .idea/sqlDataSources.xml
 # .idea/dynamic.xml
+# .idea/uiDesigner.xml
 
-## File-based project format
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
 *.ipr
-*.iml
 *.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

Global/LyX.gitignore

@@ -0,0 +1,4 @@
+# Ignore LyX backup and autosave files
+# http://www.lyx.org/
+*.lyx~
+*.lyx#

Global/Momentics.gitignore

@@ -0,0 +1,4 @@
+# Built files
+x86/
+arm/
+arm-p/

Global/Windows.gitignore

@@ -13,3 +13,6 @@ $RECYCLE.BIN/
 *.msi
 *.msm
 *.msp
+
+# Windows shortcuts
+*.lnk