Merge remote-tracking branch 'upstream/master'

ChefCookbook.gitignore

@@ -1,15 +1,7 @@
 .vagrant
-Berksfile.lock
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
 /cookbooks
 
 # Bundler
-Gemfile.lock
 bin/*
 .bundle/*
 

Dart.gitignore

@@ -1,11 +1,13 @@
-// Don’t commit the following files and directories created by pub and dart2js
+# Don’t commit the following directories created by pub.
+build/
 packages/
+
+# Or the files created by dart2js.
+*.dart.js
+*.dart.precompiled.js
 *.js_
 *.js.deps
 *.js.map
 
-// Include when developing application packages
+# Include when developing application packages.
 pubspec.lock
-
-// Avoid committing generated JavaScript files
-*.dart.js

Global/EiffelStudio.gitignore

@@ -0,0 +1,2 @@
+# The compilation directoy
+EIFGENs

Global/JetBrains.gitignore

@@ -1,4 +1,4 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
 
 ## Directory-based project format
 .idea/

Global/Linux.gitignore

@@ -1 +1,4 @@
 *~
+
+# KDE directory preferences
+.directory

Global/SASS.gitignore

@@ -1,2 +0,0 @@
-### Sass Ignores - "Sassy CSS" http://sass-lang.com/
-*.sass-cache

Global/SlickEdit.gitignore

@@ -0,0 +1,12 @@
+# SlickEdit workspace and project files are ignored by default because
+# typically they are considered to be developer-specific and not part of a
+# project.
+*.vpw
+*.vpj
+
+# SlickEdit workspace history and tag files always contain user-specific
+# data so they should not be stored in a repository.
+*.vpwhistu
+*.vpwhist
+*.vtg
+

Global/Xcode.gitignore

@@ -0,0 +1,17 @@
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+

Global/webMethods.gitignore

@@ -1,4 +1,3 @@
-**/IntegrationServer/lib/
 **/IntegrationServer/datastore/
 **/IntegrationServer/db/
 **/IntegrationServer/DocumentStore/

Haskell.gitignore

@@ -4,7 +4,7 @@ cabal-dev
 *.hi
 *.chi
 *.chs.h
-.virthualenv
+.virtualenv
 .hsenv
 .cabal-sandbox/
 cabal.sandbox.config

Idris.gitignore

@@ -0,0 +1,2 @@
+*.ibc
+*.o

Leiningen.gitignore

@@ -1,8 +1,11 @@
 pom.xml
+pom.xml.asc
 *jar
 /lib/
 /classes/
 /target/
+/checkouts/
 .lein-deps-sum
 .lein-repl-history
 .lein-plugins/
+.lein-failures

Magento.gitignore

@@ -36,6 +36,7 @@ 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/applied.patches.list
 app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional

Node.gitignore

@@ -1,17 +1,25 @@
-lib-cov
+# Logs
-lcov.info
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
 logs
-results
+*.log
-build
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# Deployed apps should consider commenting this line out:
+# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules

Objective-C.gitignore

@@ -1,23 +1,8 @@
-# OS X
-.DS_Store
-
-# Xcode
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-profile
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-
 # CocoaPods
-Pods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
+#
+# Pods/
+

OpenCart.gitignore

@@ -0,0 +1,7 @@
+.htaccess
+config.php
+download/
+image/data/
+image/cache/
+system/cache/
+system/logs/

Packer.gitignore

@@ -0,0 +1,5 @@
+# Cache objects
+packer_cache/
+
+# For built boxes
+*.box

Phalcon.gitignore

@@ -0,0 +1,2 @@
+/cache/
+/config/development/

PlayFramework.gitignore

@@ -1,19 +1,17 @@
 # Ignore Play! working directory #
-bin
+bin/
-db
+/db
-eclipse
+.eclipse
-lib
+/lib/
-log
+/logs/
-logs
+/modules
-modules
+/project/project
-precompiled
+/project/target
-project/project
+/target
-project/target
+tmp/
-target
-tmp
 test-result
 server.pid
 *.iml
 *.eml
-dist
+/dist/
 .cache

Python.gitignore

@@ -27,6 +27,7 @@ pip-log.txt
 pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+htmlcov/
 .tox/
 .coverage
 .cache

Qt.gitignore

@@ -12,8 +12,11 @@
 
 # Qt-es
 
+/.qmake.cache
+/.qmake.stash
 *.pro.user
 *.pro.user.*
+*.moc
 moc_*.cpp
 qrc_*.cpp
 ui_*.h

R.gitignore

@@ -3,3 +3,6 @@
 
 # Example code in package build process
 *-Ex.R
+
+# R data files from past sessions
+.Rdata

Rails.gitignore

@@ -1,6 +1,4 @@
 *.rbc
-*.sassc
-.sass-cache
 capybara-*.html
 .rspec
 /log

Ruby.gitignore

@@ -9,6 +9,11 @@
 /test/version_tmp/
 /tmp/
 
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
 ## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/

RubyMotion.gitignore

@@ -1,20 +0,0 @@
-.dat*
-.repl_history
-build/
-tags
-
-# Editor files
-.DS_Store
-nbproject
-.redcar
-*.swp
-*.swo
-~
-.eprj
-vendor/Pods
-*.nib
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/

TeX.gitignore

@@ -72,8 +72,20 @@
 # nomencl
 *.nlo
 
+# sagetex
+*.sagetex.sage
+*.sagetex.py
+*.sagetex.scmd
+
+# sympy
+*.sout
+*.sympy
+sympy-plots-for-*.tex/
+
 # todonotes
 *.tdo
 
 # xindy
 *.xdy
+
+

VisualStudio.gitignore

@@ -123,9 +123,8 @@ publish/
 *.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 uncomment the next line
-## 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
@@ -173,17 +172,3 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
-
-# =========================
-# Windows detritus
-# =========================
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/