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

Ada.gitignore

+# Object file
+*.o
+
+# Ada Library Information
+*.ali
\ No newline at end of file

Android.gitignore

-# built application files
+# Built application files
 *.apk
 *.ap_
 
-# files for the dex VM
+# Files for the Dalvik VM
 *.dex
 
 # Java class files
 *.class
 
-# generated files
+# Generated files
 bin/
 gen/
 
-# Ignore gradle files
+# Gradle files
 .gradle/
 build/
 

ArchLinuxPackages.gitignore

+*.tar
+*.tar.*
+*.log
+*.log.*
+*.sig
+pkg/
+src/

C.gitignore

@@ -18,4 +18,6 @@
 *.exe
 *.out
 *.app
+*.i*86
+*.x86_64
 *.hex

ChefCookbook.gitignore

+.vagrant
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml

CommonLisp.gitignore

+*.FASL
+*.fasl
+*.lisp-temp

Dart.gitignore

-// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+// Don’t commit the following files and directories created by pub and dart2js
 packages/
-.project
-.buildlog
 *.js_
 *.js.deps
 *.js.map
@@ -11,6 +9,3 @@ pubspec.lock
 
 // Avoid committing generated JavaScript files
 *.dart.js
-
-// Check for any other incovenient files generated by OS 
-// and other tools such as Eclipse, IntelliJ, etc.

Delphi.gitignore

@@ -7,4 +7,8 @@ __history
 *.map
 *.exe
 *.dll
+*.bpl
+*.dcp
+*.so
+*.apk
 bin/*

Elisp.gitignore

+# Compiled
+*.elc

GWT.gitignore

@@ -14,3 +14,15 @@ gwt-unitCache/
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
+
+#compilation logs
+.gwt/
+
+#caching for already compiled files
+gwt-unitCache/
+
+#gwt junit compilation files
+www-test/
+
+#old GWT (1.5) created this dir
+.gwt-tmp/

Global/Cloud9.gitignore

 # Cloud9 IDE - http://c9.io
 .c9revisions
+.c9

Global/DartEditor.gitignore

+.project
+.buildlog

Global/Dreamweaver.gitignore

+# DW Dreamweaver added files
+_notes
+dwsync.xml

Global/Eclipse.gitignore

 *.pydevproject
 .metadata
 .gradle
-bin/**
-tmp/**
-tmp/**/*
+bin/
+tmp/
 *.tmp
 *.bak
 *.swp
@@ -24,5 +23,8 @@ local.properties
 # PDT-specific
 .buildpath
 
+# sbteclipse plugin 
+.target
+
 # TeXlipse plugin
 .texlipse

Global/Emacs.gitignore

@@ -14,3 +14,10 @@ tramp
 
 # flymake-mode
 *_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/

Global/Lazarus.gitignore

+#ignore backup files
+backup/
+
+#ignore files generated by the compiler
+lib/
+*.compiled
+*.o
+*.or
+*.ppu
+
+#exclude executable output in windows
+*.exe
\ No newline at end of file

Gradle.gitignore

+.gradle
+build/

Grails.gitignore

@@ -28,8 +28,9 @@
 # project release file
 /*.war
 
-# plugin release file
+# plugin release files
 /*.zip
+/plugin.xml
 
 # older plugin install locations
 /plugins

Java.gitignore

 *.class
 
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
 # Package Files #
 *.jar
 *.war

Magento.gitignore

 .modgit/
 app/code/community/Find/
 app/code/community/Phoenix/
+app/code/community/Cm/
 app/code/core/
 app/design/adminhtml/default/default/
 app/design/adminhtml/default/find/
@@ -33,6 +34,7 @@ app/etc/modules/Mage_Weee.xml
 app/etc/modules/Mage_Widget.xml
 app/etc/modules/Mage_XmlConnect.xml
 app/etc/modules/Phoenix_Moneybookers.xml
+app/etc/modules/Cm_RedisSession.xml
 app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional
@@ -77,6 +79,9 @@ lib/PEAR/
 lib/phpseclib/
 lib/Varien/
 lib/Zend/
+lib/Cm/
+lib/Credis/
+lib/Magento/
 LICENSE_AFL.txt
 LICENSE.html
 LICENSE.txt
@@ -89,7 +94,7 @@ media/.htaccess
 media/import/
 media/xmlconnect/
 media/catalog/product/cache/
-
+api.php
 nbproject/
 pear
 pear/

Maven.gitignore

 target/
- *.releaseBackup
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.next
+release.properties

Node.gitignore

 lib-cov
+lcov.info
 *.seed
 *.log
 *.csv
@@ -10,5 +11,7 @@ lib-cov
 pids
 logs
 results
+build
+.grunt
 
 node_modules

Objective-C.gitignore

@@ -17,7 +17,7 @@ profile
 *.moved-aside
 DerivedData
 *.hmap
-*.xccheckout
+*.ipa
 
 # CocoaPods
 Pods

PlayFramework.gitignore

@@ -15,3 +15,5 @@ test-result
 server.pid
 *.iml
 *.eml
+dist
+.cache

Python.gitignore

@@ -39,6 +39,9 @@ coverage.xml
 .project
 .pydevproject
 
+# Rope
+.ropeproject
+
 # Django stuff:
 *.log
 *.pot

ROS.gitignore

+~$
+.swp$
+build/
+bin/
+lib/
+msg_gen/
+srv_gen/
+msg/.*Action\.msg$
+msg/.*ActionFeedback\.msg$
+msg/.*ActionGoal\.msg$
+msg/.*ActionResult\.msg$
+msg/.*Feedback\.msg$
+msg/.*Goal\.msg$
+msg/.*Result\.msg$
+msg/_.*\.py$
+
+\.pcd$
+.pyc$
+
+# Generated by dynamic reconfigure
+\.cfgc$
+/cfg/cpp/
+/cfg/.*\.py$
+
+# Ignore generated docs
+.dox$
+.wikidoc$
+
+# eclipse stuff
+.project
+.cproject
+
+# qcreator stuff
+CMakeLists.txt.user
+
+srv/_.*\.py$
+\.pcd$
+.pyc$
+qtcreator-*
+*.user
+
+/planning/cfg
+/planning/docs
+/planning/src
+
+*~$
+
+# Emacs
+.#*
+
+# Catkin custom files
+CATKIN_IGNORE

Rails.gitignore

@@ -13,6 +13,7 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
+config/secrets.yml
 
 ## Environment normalisation:
 /.bundle

SCons.gitignore

+# for projects that use SCons for building: http://http://www.scons.org/
+.sconsign.dblite

Scala.gitignore

@@ -14,3 +14,4 @@ project/plugins/project/
 
 # Scala-IDE specific
 .scala_dependencies
+.worksheet

Scrivener.gitignore

+/Files/binder.autosave
+/Files/binder.backup
+/Files/search.indexes
+/Files/user.lock
+/Files/Docs/docs.checksum
+/QuickLook/
+/Settings/ui.plist

SugarCRM.gitignore

 ## SugarCRM
 # Ignore custom .htaccess stuff.
 /.htaccess
-# Ignore large parts of the annoying cache directory without breaking things.
-cache/csv/*
-cache/dashlets/*
-cache/diagnostic/*
-cache/dynamic_fields/*
-cache/feeds/*
-cache/import/*
-cache/include/*
-cache/jsLanguage/*
-cache/modules/*
-!cache/modules/emails
-!cache/modules/Emails
-cache/pdf/*
-cache/smarty/cache/*
-cache/smarty/templates_c/*
-cache/themes/*
-cache/xml/*
+# Ignore the cache directory completely.
+# This will break the current behaviour. Which was often leading to
+# the misuse of the repository as backup replacement.
+# For development the cache directory can be safely ignored and
+# therefore it is ignored.
+/cache/
 # Ignore some files and directories from the custom directory.
-custom/history/*
-custom/modulebuilder/*
-custom/working/*
-custom/modules/*/Ext/
-custom/application/Ext/*
+/custom/history/
+/custom/modulebuilder/
+/custom/working/
+/custom/modules/*/Ext/
+/custom/application/Ext/
 # Custom configuration should also be ignored.
 /config.php
 /config_override.php
 # The silent upgrade scripts aren't needed.
-silentUpgrade*.php
+/silentUpgrade*.php
 # Logs files can safely be ignored.
 *.log
+# Ignore the new upload directories.
+/upload/
+/upload_backup/

VisualStudio.gitignore

@@ -16,9 +16,6 @@ bld/
 [Bb]in/
 [Oo]bj/
 
-# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
-!packages/*/build/
-
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -97,6 +94,9 @@ _NCrunch_*
 *.mm.*
 AutoTest.Net/
 
+# Web workbench (sass)
+.sass-cache/
+
 # Installshield output folder
 [Ee]xpress/
 
@@ -114,15 +114,19 @@ DocProject/Help/html
 publish/
 
 # Publish Web Output
-*.Publish.xml
+*.[Pp]ublish.xml
 *.azurePubxml
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
+#packages/*
 ## TODO: If the tool you use requires repositories.config, also uncomment the next line
 #!packages/repositories.config
 
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
+!packages/build/
+
 # Windows Azure Build Output
 csx/
 *.build.csdef
@@ -139,9 +143,9 @@ ClientBin/
 *~
 *.dbmdl
 *.dbproj.schemaview
-*.[Pp]ublish.xml
 *.pfx
 *.publishsettings
+node_modules/
 
 # RIA/Silverlight projects
 Generated_Code/

WordPress.gitignore

@@ -10,3 +10,4 @@ sitemap.xml
 wp-content/cache/
 wp-content/backups/
 sitemap.xml.gz
+wp-config.php

Yeoman.gitignore

+node_modules/
+bower_components/
+*.log
+
+build/
+dist/

stella.gitignore

+# Atari 2600 (Stella) support for multiple assemblers
+# - DASM
+# - CC65
+
+# Assembled binaries and object directories
+obj/
+a.out
+*.bin
+*.a26
+
+# Add in special Atari 7800-based binaries for good measure
+*.a78