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

C++.gitignore

@@ -4,6 +4,10 @@
 *.o
 *.obj
 
+# Precompiled Headers
+*.gch
+*.pch
+
 # Compiled Dynamic libraries
 *.so
 *.dylib

C.gitignore

@@ -4,6 +4,10 @@
 *.obj
 *.elf
 
+# Precompiled Headers
+*.gch
+*.pch
+
 # Libraries
 *.lib
 *.a

CraftCMS.gitignore

+# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore]
+/craft/storage/*
+!/craft/storage/logo/*
\ No newline at end of file

Dart.gitignore

 # Don’t commit the following directories created by pub.
 build/
 packages/
+.buildlog
 
 # Or the files created by dart2js.
 *.dart.js

Erlang.gitignore

@@ -4,3 +4,7 @@ deps
 *.beam
 *.plt
 erl_crash.dump
+ebin
+rel/example_project
+.concrete/DEV_MODE
+.rebar

Global/JetBrains.gitignore

 # 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

+# Ignore LyX backup and autosave files
+# http://www.lyx.org/
+*.lyx~
+*.lyx#

Global/Momentics.gitignore

+# Built files
+x86/
+arm/
+arm-p/

Global/Windows.gitignore

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

Magento.gitignore

@@ -4,6 +4,7 @@ app/code/community/Cm/
 app/code/core/
 app/design/adminhtml/default/default/
 app/design/frontend/base/
+app/design/frontend/rwd/
 app/design/frontend/default/blank/
 app/design/frontend/default/default/
 app/design/frontend/default/iphone/
@@ -106,6 +107,7 @@ shell/log.php
 skin/adminhtml/default/default/
 skin/adminhtml/default/enterprise
 skin/frontend/base/
+skin/frontend/rwd/
 skin/frontend/default/blank/
 skin/frontend/default/blue/
 skin/frontend/default/default/

Node.gitignore

@@ -21,7 +21,7 @@ build/Release
 
 # Dependency directory
 # Commenting this out is preferred by some people, see
-# https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
 node_modules
 
 # Users Environment Variables

Python.gitignore

@@ -11,6 +11,7 @@ env/
 build/
 develop-eggs/
 dist/
+downloads/
 eggs/
 lib/
 lib64/
@@ -22,7 +23,7 @@ var/
 *.egg
 
 # PyInstaller
-#  Usually these files are written by a python script from a template 
+#  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec

R.gitignore

@@ -6,3 +6,6 @@
 
 # R data files from past sessions
 .Rdata
+
+# RStudio files
+*.Rproj

Rails.gitignore

@@ -24,3 +24,8 @@ config/secrets.yml
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# if using bower-rails ignore default bower_components path bower.json files
+/vendor/assets/bower_components
+*.bowerrc
+bower.json

Symfony.gitignore

-cache/*
-log/*
-web/uploads/*
-config/databases.yml
-config/propel.ini
-data/sql/*
-lib/filter/doctrine/base/Base*
-lib/filter/doctrine/*Plugin/base/Base*
-lib/form/doctrine/base/Base*
-lib/form/doctrine/*Plugin/base/Base*
-lib/model/doctrine/base/Base*
-lib/model/doctrine/*Plugin/base/Base*
-lib/model/om/*
-lib/model/map/*
-web/*Plugin/*
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# Cache and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Composer PHAR
+/composer.phar

Symfony2.gitignore

-# Cache and logs
-/app/cache/*
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-
-# Parameters
-/app/config/parameters.yml
-/app/config/parameters.ini
-
-# Managed by Composer
-/app/bootstrap.php.cache
-/bin/
-/vendor/
-
-# Assets and user uploads
-/web/bundles/
-/web/uploads/
-
-# PHPUnit
-/app/phpunit.xml
-
-# Composer PHAR
-/composer.phar

TeX.gitignore

@@ -9,6 +9,7 @@
 
 ## Intermediate documents:
 *.dvi
+*-converted-to.*
 # these rules might exclude image files for figures etc.
 # *.ps
 # *.eps
@@ -20,6 +21,7 @@
 *.blg
 *-blx.aux
 *-blx.bib
+*.brf
 *.run.xml
 
 ## Build tool auxiliary files:
@@ -50,6 +52,12 @@
 *.[1-9]R
 *.[1-9][0-9]R
 *.[1-9][0-9][0-9]R
+*.eledsec[1-9]
+*.eledsec[1-9]R
+*.eledsec[1-9][0-9]
+*.eledsec[1-9][0-9]R
+*.eledsec[1-9][0-9][0-9]
+*.eledsec[1-9][0-9][0-9]R
 
 # glossaries
 *.acn

Unity.gitignore

 [Ll]ibrary/
 [Tt]emp/
 [Oo]bj/
+[Bb]uild/
 
 # Autogenerated VS/MD solution and project files
 /*.csproj

VisualStudio.gitignore

@@ -128,6 +128,7 @@ publish/
 # TODO: Comment the next line if you want to checkin your web deploy settings 
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
+*.publishproj
 
 # NuGet Packages
 *.nupkg

Xojo.gitignore

+# Xojo (formerly REALbasic and Real Studio)
+
+Builds*
+*.debug
+*.debug.app
+Debug*.exe
+Debug*/Debug*.exe
+Debug*/Debug*\ Libs
+*.rbuistate
+*.obsolete

ZendFramework.gitignore

@@ -3,18 +3,18 @@ composer.phar
 vendor/
 
 # Local configs
-config/autoload/*local.php
+config/autoload/*.local.php
 
 # Binary gettext files
-*.po
+*.mo
 
 # Data
-log/
-logs/
-cache/
+data/logs/
+data/cache/
+data/sessions/
+data/tmp/
 temp/
-tmp/
 
-# ZF1
+# Legacy ZF1
 demos/
 extras/documentation