Merge remote-tracking branch 'refs/remotes/github/master'

Android.gitignore

@@ -24,3 +24,9 @@ proguard/
 
 # Log Files
 *.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/

AppEngine.gitignore

@@ -0,0 +1,2 @@
+# Google App Engine generated folder
+appengine-generated/

ArchLinuxPackages.gitignore

@@ -1,14 +1,13 @@
 *.tar
 *.tar.*
+*.jar
+*.exe
+*.msi
 *.zip
 *.tgz
 *.log
 *.log.*
 *.sig
 
-# AUR metadata
-.AURINFO
-.SRCINFO
-
 pkg/
 src/

Autotools.gitignore

@@ -5,9 +5,13 @@ Makefile.in
 # http://www.gnu.org/software/autoconf
 
 /autom4te.cache
+/autoscan.log
+/autoscan-*.log
 /aclocal.m4
 /compile
+/config.h.in
 /configure
+/configure.scan
 /depcomp
 /install-sh
 /missing

C.gitignore

@@ -27,3 +27,6 @@
 *.i*86
 *.x86_64
 *.hex
+
+# Debug files
+*.dSYM/

CMake.gitignore

@@ -1,5 +1,6 @@
 CMakeCache.txt
 CMakeFiles
+CMakeScripts
 Makefile
 cmake_install.cmake
 install_manifest.txt

CUDA.gitignore

@@ -0,0 +1,6 @@
+*.i
+*.ii
+*.gpu
+*.ptx
+*.cubin
+*.fatbin

CakePHP.gitignore

@@ -1,7 +1,13 @@
-tmp/*
+# CakePHP 3
-[Cc]onfig/core.php
+
-[Cc]onfig/database.php
+/vendor/*
-app/tmp/*
+/config/app.php
-app/[Cc]onfig/core.php
+/tmp/*
-app/[Cc]onfig/database.php
+/logs/*
-!empty
+
+# CakePHP 2
+
+/app/tmp/*
+/app/Config/core.php
+/app/Config/database.php
+/vendors/*

CodeIgniter.gitignore

@@ -1,6 +1,6 @@
 */config/development
 */logs/log-*.php
-*/logs/!index.html
+!*/logs/index.html
 */cache/*
-*/cache/!index.html
+!*/cache/index.html
-*/cache/!.htaccess
+!*/cache/.htaccess

Composer.gitignore

@@ -1,5 +1,5 @@
 composer.phar
-vendor/
+/vendor/
 
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

D.gitignore

@@ -0,0 +1,20 @@
+# Compiled Object files
+*.o
+*.obj
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.a
+*.lib
+
+# Executables
+*.exe
+
+# DUB
+.dub
+docs.json
+__dummy.html

Dart.gitignore

@@ -1,14 +1,27 @@
-# Don’t commit the following directories created by pub.
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
 .buildlog
+.packages
+.project
 .pub/
 build/
-packages
+**/packages/
 
-# Or the files created by dart2js.
+# Files created by dart2js
+# (Most Dart developers will use pub build to compile Dart, use/modify these 
+#  rules if you intend to use dart2js directly
+#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
+#  differentiate from explicit Javascript files)
 *.dart.js
-*.js_
+*.part.js
 *.js.deps
 *.js.map
+*.info.json
 
-# Include when developing application packages.
+# Directory created by dartdoc
+doc/api/
+
+# Don't commit pubspec lock file 
+# (Library packages only! Remove pattern if developing an application package)
 pubspec.lock

Delphi.gitignore

@@ -21,6 +21,10 @@
 # Uncomment this if it is not mobile development and you do not use remote debug feature.
 #*.deployproj
 # 
+# C++ object files produced when C/C++ Output file generation is configured.
+# Uncomment this if you are not using external objects (zlib library for example).
+#*.obj
+#
 
 # Delphi compiler-generated binaries (safe to delete)
 *.exe
@@ -37,9 +41,13 @@
 *.tds
 *.dcu
 *.lib
+*.a
+*.o
+*.ocx
 
 # Delphi autogenerated files (duplicated info)
 *.cfg
+*.hpp
 *Resource.rc
 
 # Delphi local files (user-specific info)
@@ -53,5 +61,5 @@
 __history/
 *.~*
 
-# Castalia statistics file
+# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
 *.stat

Elixir.gitignore

@@ -1,4 +1,5 @@
 /_build
+/cover
 /deps
 erl_crash.dump
 *.ez

Elm.gitignore

@@ -0,0 +1,5 @@
+# elm-package generated files
+elm-package.json
+elm-stuff/
+# elm-repl generated files
+repl-temp-*

ExtJs.gitignore

@@ -1,4 +1,4 @@
 .architect
-boostrap.json
+bootstrap.json
 build/
 ext/

GitBook.gitignore

@@ -4,7 +4,7 @@
 
 ## 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://docs.npmjs.com/misc/faq#should-i-check-my-node_modules-folder-into-git
 node_modules
 
 # Book build output

Global/Eclipse.gitignore

@@ -11,6 +11,9 @@ local.properties
 .settings/
 .loadpath
 
+# Eclipse Core
+.project
+
 # External tool builders
 .externalToolBuilders/
 
@@ -20,6 +23,12 @@ local.properties
 # CDT-specific
 .cproject
 
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
 # PDT-specific
 .buildpath
 
@@ -28,3 +37,6 @@ local.properties
 
 # TeXlipse plugin
 .texlipse
+
+# STS (Spring Tool Suite)
+.springBeans

Global/Ensime.gitignore

@@ -1,3 +1,4 @@
 # Ensime specific
 .ensime
+.ensime_cache/
 .ensime_lucene/

Global/GPG.gitignore

@@ -0,0 +1,2 @@
+secring.*
+

Global/JDeveloper.gitignore

@@ -1,4 +1,13 @@
+# default application storage directory used by the IDE Performance Cache feature
 .data/
+
+# used for ADF styles caching
 temp/
+
+# default output directories
 classes/
+deploy/
+javadoc/
+
+# lock file, a part of Oracle Credential Store Framework
 cwallet.sso.lck

Global/JetBrains.gitignore

@@ -1,4 +1,4 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 
 *.iml
 
@@ -10,6 +10,7 @@
 # .idea/workspace.xml
 # .idea/tasks.xml
 # .idea/dictionaries
+# .idea/shelf
 
 # Sensitive or high-churn files:
 # .idea/dataSources.ids
@@ -32,7 +33,7 @@
 ## Plugin-specific files:
 
 # IntelliJ
-out/
+/out/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -44,3 +45,4 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
+fabric.properties

Global/Lazarus.gitignore

@@ -1,15 +1,30 @@
-#ignore backup files
+# Lazarus compiler-generated binaries (safe to delete)
-backup/
+*.exe
-
+*.dll
-#ignore files generated by the compiler
+*.so
-lib/
+*.dylib
+*.lrs
+*.res
 *.compiled
+*.dbg
+*.ppu
 *.o
 *.or
-*.ppu
+*.a
 
-#ignore debug information files
+# Lazarus autogenerated files (duplicated info)
-*.dbg
+*.rst
+*.rsj
+*.lrt
 
-#exclude executable output in windows
+# Lazarus local files (user-specific info)
-*.exe
+*.lps
+
+# Lazarus backups and unit output folders.
+# These can be changed by user in Lazarus/project options.
+backup/
+*.bak
+lib/
+
+# Application bundle for Mac OS
+*.app/

Global/Linux.gitignore

@@ -2,3 +2,6 @@
 
 # KDE directory preferences
 .directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*

Global/Mercurial.gitignore

@@ -1,3 +1,6 @@
-/.hg/*
+.hg/
-*/.hg/*
 .hgignore
+.hgsigs
+.hgsub
+.hgsubstate
+.hgtags

Global/MicrosoftOffice.gitignore

@@ -8,3 +8,6 @@
 
 # Excel Backup File
 *.xlk
+
+# PowerPoint temporary
+~$*.ppt*

Global/NetBeans.gitignore

@@ -4,4 +4,4 @@ nbbuild/
 dist/
 nbdist/
 nbactions.xml
-nb-configuration.xml
+.nb-gradle/

Global/OSX.gitignore

@@ -8,9 +8,13 @@ Icon
 # Thumbnails
 ._*
 
-# Files that might appear on external disk
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
 .Spotlight-V100
+.TemporaryItems
 .Trashes
+.VolumeIcon.icns
 
 # Directories potentially created on remote AFP share
 .AppleDB

Global/Otto.gitignore

@@ -0,0 +1 @@
+.otto/

Global/README.md

@@ -4,7 +4,7 @@ This directory contains globally useful gitignores,
 e.g. OS-specific and editor specific.
 
 For more on global gitignores:
-<http://help.github.com/git-ignore/>
+<https://help.github.com/articles/ignoring-files/#create-a-global-gitignore>
 
 And a good blog post about 'em:
 <http://augustl.com/blog/2009/global_gitignores>

Global/Redis.gitignore

@@ -0,0 +1,3 @@
+# Ignore redis binary dump (dump.rdb) files
+
+*.rdb

Global/SynopsysVCS.gitignore

@@ -0,0 +1,36 @@
+# Waveform formats
+*.vcd
+*.vpd
+*.evcd
+*.fsdb
+
+# Default name of the simulation executable.  A different name can be 
+# specified with this switch (the associated daidir database name is 
+# also taken from here):  -o <path>/<filename>
+simv
+
+# Generated for Verilog and VHDL top configs
+simv.daidir/
+simv.db.dir/
+
+# Infrastructure necessary to co-simulate SystemC models with 
+# Verilog/VHDL models.  An alternate directory may be specified with this
+# switch:  -Mdir=<directory_path>
+csrc/
+
+# Log file - the following switch allows to specify the file that will be
+# used to write all messages from simulation:  -l <filename>
+*.log
+
+# Coverage results (generated with urg) and database location.  The 
+# following switch can also be used:  urg -dir <coverage_directory>.vdb
+simv.vdb/
+urgReport/
+
+# DVE and UCLI related files.
+DVEfiles/
+ucli.key
+
+# When the design is elaborated for DirectC, the following file is created
+# with declarations for C/C++ functions.
+vc_hdrs.h

Global/Tags.gitignore

@@ -1,7 +1,9 @@
 # Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
+.TAGS
 !TAGS/
 tags
+.tags
 !tags/
 gtags.files
 GTAGS

Global/VirtualEnv.gitignore

@@ -4,5 +4,7 @@
 [Bb]in
 [Ii]nclude
 [Ll]ib
+[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
+pip-selfcheck.json

Global/VisualStudioCode.gitignore

@@ -0,0 +1,2 @@
+.vscode
+

Global/Xcode.gitignore

@@ -1,4 +1,12 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -8,7 +16,8 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
 *.moved-aside
-DerivedData
 *.xcuserstate

Gradle.gitignore

@@ -3,3 +3,9 @@ build/
 
 # Ignore Gradle GUI config
 gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache

Haskell.gitignore

@@ -6,12 +6,11 @@ cabal-dev
 *.chs.h
 *.dyn_o
 *.dyn_hi
-.virtualenv
 .hpc
 .hsenv
 .cabal-sandbox/
 cabal.sandbox.config
-cabal.config
 *.prof
 *.aux
 *.hp
+.stack-work/

IGORPro.gitignore

@@ -0,0 +1,5 @@
+# Avoid including Experiment files: they can be created and edited locally to test the ipf files
+*.pxp
+*.pxt
+*.uxp
+*.uxt

Jekyll.gitignore

@@ -1,2 +1,3 @@
 _site/
 .sass-cache/
+.jekyll-metadata

Joomla.gitignore

@@ -2,8 +2,13 @@
 /.htaccess
 /administrator/cache/*
 /administrator/components/com_admin/*
+/administrator/components/com_ajax/*
+/administrator/components/com_tags/*
 /administrator/components/com_banners/*
 /administrator/components/com_cache/*
+/administrator/components/com_postinstall/*
+/administrator/components/com_joomlaupdate/*
+/administrator/components/com_contenthistory/*
 /administrator/components/com_categories/*
 /administrator/components/com_checkin/*
 /administrator/components/com_config/*
@@ -28,7 +33,52 @@
 /administrator/components/index.html
 /administrator/help/*
 /administrator/includes/*
-/administrator/language/en-GB/
+/administrator/language/en-GB/en-GB.com_ajax.ini
+/administrator/language/en-GB/en-GB.com_ajax.sys.ini
+/administrator/language/en-GB/en-GB.com_contenthistory.ini
+/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
+/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
+/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
+/administrator/language/en-GB/en-GB.com_postinstall.ini
+/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
+/administrator/language/en-GB/en-GB.com_sitemapjen.sys.ini
+/administrator/language/en-GB/en-GB.com_tags.ini
+/administrator/language/en-GB/en-GB.com_tags.sys.ini
+/administrator/language/en-GB/en-GB.mod_stats_admin.ini
+/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
+/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_contact.ini
+/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_finder.ini
+/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_categories.ini
+/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
+/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_content.ini
+/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
+/administrator/language/en-GB/en-GB.plg_finder_tags.ini
+/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
+/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
+/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
+/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_tags.ini
+/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
+/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
+/administrator/language/en-GB/en-GB.tpl_isis.ini
+/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
+/administrator/language/en-GB/install.xml
 /administrator/language/en-GB/en-GB.com_admin.ini
 /administrator/language/en-GB/en-GB.com_admin.sys.ini
 /administrator/language/en-GB/en-GB.com_banners.ini
@@ -218,15 +268,22 @@
 /administrator/modules/mod_toolbar/*
 /administrator/modules/mod_unread/*
 /administrator/modules/mod_version/*
+/administrator/modules/mod_stats_admin/*
 /administrator/modules/index.html
 /administrator/templates/bluestork/*
+/administrator/templates/isis/*
 /administrator/templates/hathor/*
 /administrator/templates/system/*
 /administrator/templates/index.html
 /administrator/index.php
 /cache/*
+/bin/*
 /cli/*
 /components/com_banners/*
+/components/com_ajax/*
+/components/com_config/*
+/components/com_contenthistory/*
+/components/com_tags/*
 /components/com_contact/*
 /components/com_content/*
 /components/com_finder/*
@@ -245,12 +302,34 @@
 /images/powered_by.png
 /includes/*
 /installation/*
+/language/en-GB/en-GB.com_ajax.ini
+/language/en-GB/en-GB.com_config.ini
 /language/en-GB/en-GB.com_contact.ini
+/language/en-GB/en-GB.com_finder.ini
+/language/en-GB/en-GB.com_tags.ini
+/language/en-GB/en-GB.finder_cli.ini
+/language/en-GB/en-GB.lib_fof.sys.ini
 /language/en-GB/en-GB.com_content.ini
+/language/en-GB/en-GB.lib_idna_convert.sys.ini
 /language/en-GB/en-GB.com_mailto.ini
+/language/en-GB/en-GB.lib_joomla.sys.ini
+/language/en-GB/en-GB.lib_phpass.sys.ini
+/language/en-GB/en-GB.lib_phpmailer.sys.ini
+/language/en-GB/en-GB.lib_phputf8.sys.ini
+/language/en-GB/en-GB.lib_simplepie.sys.ini
 /language/en-GB/en-GB.com_media.ini
+/language/en-GB/en-GB.mod_finder.ini
 /language/en-GB/en-GB.com_messages.ini
+/language/en-GB/en-GB.mod_tags_popular.ini
+/language/en-GB/en-GB.mod_tags_popular.sys.ini
+/language/en-GB/en-GB.mod_tags_similar.ini
+/language/en-GB/en-GB.mod_tags_similar.sys.ini
+/language/en-GB/en-GB.mod_finder.sys.ini
+/language/en-GB/en-GB.tpl_beez3.ini
+/language/en-GB/en-GB.tpl_beez3.sys.ini
 /language/en-GB/en-GB.com_newsfeeds.ini
+/language/en-GB/en-GB.tpl_protostar.ini
+/language/en-GB/en-GB.tpl_protostar.sys.ini
 /language/en-GB/en-GB.com_search.ini
 /language/en-GB/en-GB.com_users.ini
 /language/en-GB/en-GB.com_weblinks.ini
@@ -371,6 +450,7 @@
 /plugins/authentication/ldap/*
 /plugins/authentication/index.html
 /plugins/captcha/recaptcha/*
+/plugins/captcha/index.html
 /plugins/content/emailcloak/*
 /plugins/content/example/*
 /plugins/content/finder/*
@@ -380,6 +460,7 @@
 /plugins/content/pagebreak/*
 /plugins/content/pagenavigation/*
 /plugins/content/vote/*
+/plugins/content/contact/*
 /plugins/content/index.html
 /plugins/editors/codemirror/*
 /plugins/editors/none/*
@@ -398,14 +479,18 @@
 /plugins/finder/contacts/*
 /plugins/finder/content/*
 /plugins/finder/newsfeeds/*
+/plugins/finder/tags/*
 /plugins/finder/weblinks/*
+/plugins/installer/*
 /plugins/quickicon/extensionupdate/*
 /plugins/quickicon/joomlaupdate/*
+/plugins/quickicon/index.html
 /plugins/search/categories/*
 /plugins/search/contacts/*
 /plugins/search/content/*
 /plugins/search/newsfeeds/*
 /plugins/search/weblinks/*
+/plugins/search/tags/*
 /plugins/search/index.html
 /plugins/system/cache/*
 /plugins/system/debug/*
@@ -419,6 +504,7 @@
 /plugins/system/remember/*
 /plugins/system/sef/*
 /plugins/system/index.html
+/plugins/twofactorauth/*
 /plugins/user/contactcreator/*
 /plugins/user/example/*
 /plugins/user/joomla/*
@@ -426,8 +512,10 @@
 /plugins/user/index.html
 /plugins/index.html
 /templates/atomic/*
+/templates/beez3/*
 /templates/beez_20/*
 /templates/beez5/*
+/templates/protostar/*
 /templates/system/*
 /templates/index.html
 /tmp/*

Jython.gitignore

@@ -1,2 +0,0 @@
-*.pyc
-*.class

KiCAD.gitignore

@@ -0,0 +1,13 @@
+# For PCBs designed using KiCAD: http://www.kicad-pcb.org/
+
+# Temporary files
+*.000
+*.bak
+*.bck
+*.kicad_pcb-bak
+
+# Netlist files (exported from Eeschema)
+*.net
+
+# Autorouter files (exported from Pcbnew)
+.dsn

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 GitHub, Inc.
+Copyright (c) 2015 GitHub, Inc.
 
 Permission is hereby granted,  free of charge,  to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Laravel.gitignore

@@ -1,3 +1,14 @@
-/bootstrap/compiled.php
+vendor/
+node_modules/
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+bootstrap/cache/
+storage/
 .env.*.php
 .env.php
+.env
+.env.example

Lua.gitignore

@@ -0,0 +1,41 @@
+# Compiled Lua sources
+luac.out
+
+# luarocks build files
+*.src.rock
+*.zip
+*.tar.gz
+
+# Object files
+*.o
+*.os
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+*.def
+*.exp
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+

Magento.gitignore

@@ -1,4 +1,6 @@
+.htaccess.sample
 .modgit/
+.modman/
 app/code/community/Phoenix/
 app/code/community/Cm/
 app/code/core/
@@ -20,6 +22,7 @@ app/etc/modules/Mage_Bundle.xml
 app/etc/modules/Mage_Captcha.xml
 app/etc/modules/Mage_Centinel.xml
 app/etc/modules/Mage_Compiler.xml
+app/etc/modules/Mage_ConfigurableSwatches.xml
 app/etc/modules/Mage_Connect.xml
 app/etc/modules/Mage_CurrencySymbol.xml
 app/etc/modules/Mage_Downloadable.xml
@@ -42,14 +45,14 @@ app/etc/local.xml
 app/.htaccess
 app/locale/
 app/Mage.php
-cron.php
+/cron.php
 cron.sh
 downloader/
 errors/
 favicon.ico
-get.php
+/get.php
 includes/
-index.php
+/index.php
 index.php.sample
 /install.php
 js/blank.html
@@ -75,6 +78,7 @@ lib/.htaccess
 lib/LinLibertineFont/
 lib/Mage/
 lib/PEAR/
+lib/Pelago/
 lib/phpseclib/
 lib/Varien/
 lib/Zend/
@@ -85,7 +89,7 @@ LICENSE_AFL.txt
 LICENSE.html
 LICENSE.txt
 LICENSE_EE*
-mage
+/mage
 media/customer/
 media/dhl/
 media/downloadable/
@@ -93,7 +97,8 @@ media/.htaccess
 media/import/
 media/xmlconnect/
 media/catalog/product/cache/
-api.php
+media/catalog/product/placeholder/default/
+/api.php
 nbproject/
 pear
 pear/
@@ -104,6 +109,7 @@ shell/abstract.php
 shell/compiler.php
 shell/indexer.php
 shell/log.php
+sitemap.xml
 skin/adminhtml/default/default/
 skin/adminhtml/default/enterprise
 skin/frontend/base/

Maven.gitignore

@@ -4,3 +4,6 @@ pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
 release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties

Mercury.gitignore

@@ -1,4 +1,5 @@
 Mercury/
+Mercury.modules
 *.mh
 *.err
 *.init

Meteor.gitignore

@@ -1,2 +0,0 @@
-.meteor/local
-.meteor/meteorite

Nim.gitignore

@@ -0,0 +1 @@
+nimcache/

Node.gitignore

@@ -1,6 +1,7 @@
 # Logs
 logs
 *.log
+npm-debug.log*
 
 # Runtime data
 pids
@@ -23,5 +24,11 @@ coverage
 build/Release
 
 # Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
 node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history

OCaml.gitignore

@@ -7,3 +7,14 @@
 *.cmx
 *.cmxs
 *.cmxa
+
+# ocamlbuild working directory
+_build/
+
+# ocamlbuild targets
+*.byte
+*.native
+
+# oasis generated files
+setup.data
+setup.log

Objective-C.gitignore

@@ -1,6 +1,12 @@
 # Xcode
 #
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,17 +16,38 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
 *.moved-aside
-DerivedData
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
-*.xcuserstate
 
 # CocoaPods
 #
 # 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
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots

OpenCart.gitignore

@@ -9,3 +9,5 @@ image/data/
 image/cache/
 system/cache/
 system/logs/
+
+system/storage/

Perl.gitignore

@@ -17,3 +17,4 @@ nytprof.out
 /pm_to_blib
 *.o
 *.bs
+/_eumm/

PlayFramework.gitignore

@@ -5,13 +5,11 @@ bin/
 /lib/
 /logs/
 /modules
-/project/project
 /project/target
 /target
 tmp/
 test-result
 server.pid
-*.iml
 *.eml
 /dist/
 .cache

Prestashop.gitignore

@@ -1,29 +1,25 @@
-# Directories content
+# Private files
-cache/class_index.php
+# The following files contain your database credentials and other personal data.
-cache/smarty/cache/*
-!cache/smarty/cache/index.php
-cache/smarty/compile/*
-!cache/smarty/compile/index.php
-cache/tcpdf/*
-!cache/tcpdf/index.php
 
+config/settings.*.php
+
+# Cache, temp and generated files
+# The following files are generated by PrestaShop.
+
+admin-dev/autoupgrade/
+/cache/*
 config/xml/*.xml
-config/settings.inc.php
+/log/*
+*sitemap.xml
+themes/*/cache/
+modules/*/config*.xml
 
-log/*.log
+# Site content
+# The following folders contain product images, virtual products, CSV's, etc.
 
-img/*
+admin-dev/backups/
-!img/index.php
+admin-dev/export/
-!img/*/index.php
+admin-dev/import/
-
+download/
-tools/smarty*/cache/*.php
+/img/*
-!tools/smarty*/cache/index.php
+upload/
-tools/smarty*/compile/*.php
-!tools/smarty*/compile/index.php
-
-themes/default/cache/*.js
-themes/default/cache/*.css
-
-# Ignore files on root directory
-robots.txt
-sitemap.xml

Python.gitignore

@@ -1,6 +1,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+*$py.class
 
 # C extensions
 *.so
@@ -13,6 +14,7 @@ develop-eggs/
 dist/
 downloads/
 eggs/
+.eggs/
 lib/
 lib64/
 parts/
@@ -36,9 +38,12 @@ pip-delete-this-directory.txt
 htmlcov/
 .tox/
 .coverage
+.coverage.*
 .cache
 nosetests.xml
 coverage.xml
+*,cover
+.hypothesis/
 
 # Translations
 *.mo

Qt.gitignore

@@ -23,7 +23,7 @@ moc_*.cpp
 qrc_*.cpp
 ui_*.h
 Makefile*
-*-build-*
+*build-*
 
 # QtCreator
 

R.gitignore

@@ -2,6 +2,9 @@
 .Rhistory
 .Rapp.history
 
+# Session Data files
+.RData
+
 # Example code in package build process
 *-Ex.R
 
@@ -11,3 +14,6 @@
 # produced vignettes
 vignettes/*.html
 vignettes/*.pdf
+
+# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
+.httr-oauth

README.md

@@ -70,9 +70,9 @@ Here’s how we suggest you go about proposing a change to this project:
 Using the web-based interface to make changes is fine too, and will help you
 by automatically forking the project and prompting to send a pull request too.
 
-[fork]: http://help.github.com/forking/
+[fork]: https://help.github.com/articles/fork-a-repo/
 [branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
-[pr]: http://help.github.com/pull-requests/
+[pr]: https://help.github.com/articles/using-pull-requests/
 
 ## License
 

Rails.gitignore

@@ -30,3 +30,6 @@ config/secrets.yml
 /vendor/assets/bower_components
 *.bowerrc
 bower.json
+
+# Ignore pow environment settings
+.powenv

Ruby.gitignore

@@ -5,6 +5,7 @@
 /InstalledFiles
 /pkg/
 /spec/reports/
+/spec/examples.txt
 /test/tmp/
 /test/version_tmp/
 /tmp/
@@ -22,6 +23,7 @@ build/
 
 ## Environment normalisation:
 /.bundle/
+/vendor/bundle
 /lib/bundler/man/
 
 # for a library or gem, you might want to ignore these files since the code is

Rust.gitignore

@@ -9,3 +9,7 @@
 
 # Generated by Cargo
 /target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+Cargo.lock

Sass.gitignore

@@ -1,2 +1,2 @@
-.sass-cache
+.sass-cache/
 *.css.map

Swift.gitignore

@@ -1,6 +1,12 @@
 # Xcode
 #
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,17 +16,38 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
 *.moved-aside
-DerivedData
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
-*.xcuserstate
 
 # CocoaPods
 #
 # 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
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots

Symfony.gitignore

@@ -26,6 +26,9 @@
 /web/bundles/
 /web/uploads/
 
+# Assets managed by Bower
+/web/assets/vendor/
+
 # PHPUnit
 /app/phpunit.xml
 /phpunit.xml

TeX.gitignore

@@ -26,16 +26,21 @@
 
 ## Build tool auxiliary files:
 *.fdb_latexmk
+*.synctex
 *.synctex.gz
 *.synctex.gz(busy)
 *.pdfsync
 
 ## Auxiliary and intermediate files from other packages:
 
+
 # algorithms
 *.alg
 *.loa
 
+# achemso
+acs-*.bib
+
 # amsthm
 *.thm
 
@@ -66,9 +71,17 @@
 *.glo
 *.gls
 
+# gnuplottex
+*-gnuplottex-*
+
 # hyperref
 *.brf
 
+# knitr
+*-concordance.tex
+*.tikz
+*-tikzDictionary
+
 # listings
 *.lol
 
@@ -81,14 +94,19 @@
 # minitoc
 *.maf
 *.mtc
-*.mtc0
+*.mtc[0-9]
+*.mtc[1-9][0-9]
 
 # minted
+_minted*
 *.pyg
 
 # morewrites
 *.mw
 
+# mylatexformat
+*.fmt
+
 # nomencl
 *.nlo
 
@@ -102,8 +120,28 @@
 *.sympy
 sympy-plots-for-*.tex/
 
+#pythontex
+*.pytxcode
+pythontex-files-*/
+
+# Texpad
+.texpadtmp
+
+# TikZ & PGF
+*.dpth
+*.md5
+*.auxlock
+
 # todonotes
 *.tdo
 
 # xindy
 *.xdy
+
+# WinEdt
+*.bak
+*.sav
+
+# endfloat
+*.ttt
+*.fff

Typo3.gitignore

@@ -1,18 +1,20 @@
-## TYPO3 v4
+## TYPO3 v6.2
 # Ignore serveral upload and file directories.
 /fileadmin/user_upload/
 /fileadmin/_temp_/
+/fileadmin/_processed_/
 /uploads/
 # Ignore cache
 /typo3conf/temp_CACHED*
 /typo3conf/temp_fieldInfo.php
-# Ignore local config which overrides typo3 config.
+/typo3conf/deprecation_*.log
-# You should include your local stuff with `@include('localconf_local.php');` at the end of localconf.php.
+/typo3conf/AdditionalConfiguration.php
-# See http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git for details.
-/typo3conf/localconf_local.php
 # Ignore system folders, you should have them symlinked.
-# If not comment out the following two entries.
+# If not comment out the following entries.
 /typo3
-/t3lib
+/typo3_src
+/typo3_src-*
+/.htaccess
+/index.php
 # Ignore temp directory.
 /typo3temp/

Umbraco.gitignore

@@ -1,12 +1,11 @@
 # Note: VisualStudio gitignore rules may also be relevant
 
+# Umbraco
 # Ignore unimportant folders generated by Umbraco
-**/App_Data/ClientDependency/
-**/App_Data/ExamineIndexes/
 **/App_Data/Logs/
 **/App_Data/[Pp]review/
 **/App_Data/TEMP/
-Cached/
+**/App_Data/NuGetBackup/
 
 # Ignore Umbraco content cache file
 **/App_Data/umbraco.config
@@ -15,3 +14,6 @@ Cached/
 # Make sure to include details from VisualStudio.gitignore BEFORE this
 !**/App_Data/[Pp]ackages/
 !**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
+
+# ImageProcessor DiskCache 
+**/App_Data/cache/

Unity.gitignore

@@ -1,17 +1,21 @@
-[Ll]ibrary/
+/[Ll]ibrary/
-[Tt]emp/
+/[Tt]emp/
-[Oo]bj/
+/[Oo]bj/
-[Bb]uild/
+/[Bb]uild/
 
 # Autogenerated VS/MD solution and project files
-/*.csproj
+*.csproj
-/*.unityproj
+*.unityproj
-/*.sln
+*.sln
-/*.suo
+*.suo
-/*.user
+*.tmp
-/*.userprefs
+*.user
-/*.pidb
+*.userprefs
-/*.booproj
+*.pidb
+*.booproj
+
+# Unity3D generated meta files
+*.pidb.meta
 
 # Unity3D Generated File On Crash Reports
 sysinfo.txt

UnrealEngine.gitignore

@@ -0,0 +1,58 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.sln
+*.suo
+*.opensdf
+*.sdf
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+
+# Builds
+Build/*
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Configuration files generated by the Editor
+Saved/*
+
+# Compiled source files for the engine to use
+Intermediate/*
+
+# Cache files for the editor to use
+DerivedDataCache/*

VisualStudio.gitignore

@@ -7,6 +7,9 @@
 *.userosscache
 *.sln.docstates
 
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -19,8 +22,10 @@ bld/
 [Bb]in/
 [Oo]bj/
 
-# Roslyn cache directories
+# Visual Studio 2015 cache/options directory
-*.ide/
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -35,6 +40,10 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
+# DNX
+project.lock.json
+artifacts/
+
 *_i.c
 *_p.c
 *_i.h
@@ -67,6 +76,7 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
@@ -75,6 +85,7 @@ ipch/
 *.psess
 *.vsp
 *.vspx
+*.sap
 
 # TFS 2012 Local Workspace
 $tf/
@@ -87,7 +98,7 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding addin-in
+# JustCode is a .NET coding add-in
 .JustCode
 
 # TeamCity is a build add-in
@@ -99,6 +110,7 @@ _TeamCity*
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
 
 # MightyMoose
 *.mm.*
@@ -137,19 +149,27 @@ publish/
 **/packages/*
 # except build/, which is used as an MSBuild target.
 !**/packages/build/
-# If using the old MSBuild-Integrated Package Restore, uncomment this:
+# Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
 
 # Windows Azure Build Output
 csx/
 *.build.csdef
 
+# Windows Azure Emulator
+ecf/
+rcf/
+
 # Windows Store app package directory
 AppPackages/
 
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
 # Others
-sql/
-*.Cache
 ClientBin/
 [Ss]tyle[Cc]op.*
 ~$*
@@ -159,7 +179,7 @@ ClientBin/
 *.pfx
 *.publishsettings
 node_modules/
-bower_components/
+orleans.codegen.cs
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -183,3 +203,29 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+
+# FAKE - F# Make
+.fake/

Waf.gitignore

@@ -1,3 +1,4 @@
 # for projects that use Waf for building: http://code.google.com/p/waf/
 .waf-*
+.waf3-*
 .lock-*

WordPress.gitignore

@@ -11,3 +11,8 @@ wp-content/cache/
 wp-content/upgrade/
 wp-content/uploads/
 wp-content/wp-cache-config.php
+wp-content/plugins/hello.php
+
+/readme.html
+/license.txt
+