Merge remote-tracking branch 'origin/master' into pr/506

Conflicts:
	Yii.gitignore

Actionscript.gitignore

@@ -8,4 +8,4 @@ bin-release/
 
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
-# information for Eclipse / Flash Builder.
+# information for Eclipse / Flash Builder.

Android.gitignore

@@ -21,10 +21,3 @@ local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
-

C++.gitignore

@@ -2,12 +2,20 @@
 *.slo
 *.lo
 *.o
+*.obj
 
 # Compiled Dynamic libraries
 *.so
 *.dylib
+*.dll
 
 # Compiled Static libraries
 *.lai
 *.la
 *.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app

C.gitignore

@@ -1,5 +1,8 @@
 # Object files
 *.o
+*.ko
+*.obj
+*.elf
 
 # Libraries
 *.lib
@@ -15,3 +18,4 @@
 *.exe
 *.out
 *.app
+*.hex

CONTRIBUTING.md

@@ -0,0 +1,34 @@
+# Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
+
+- **Provide a link to the application or project’s homepage**. Unless it’s
+  extremely popular, there’s a chance the maintainers don’t know about or use
+  the language, framework, editor, app, or project your change applies to.
+
+- **Provide links to documentation** supporting the change you’re making.
+  Current, canonical documentation mentioning the files being ignored is best.
+  If documentation isn’t available to support your change, do the best you can
+  to explain what the files being ignored are for.
+
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+  take a sentence or two to tell us why your change or addition should happen.
+  It’s especially helpful to articulate why this change applies to *everyone*
+  who works with the applicable technology, rather than just you or your team.
+
+- **Please consider the scope of your change**. If your change specific to a
+  certain language or framework, then make sure the change is made to the
+  template for that language or framework, rather than to the template for an
+  editor, tool, or operating system.
+
+- **Please only modify *one template* per pull request**. This helps keep pull
+  requests and feedback focused on a specific project or technology.
+
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
+
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.

CakePHP.gitignore

@@ -4,4 +4,4 @@ tmp/*
 app/tmp/*
 app/[Cc]onfig/core.php
 app/[Cc]onfig/database.php
-!empty
+!empty

Composer.gitignore

@@ -0,0 +1,6 @@
+composer.phar
+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
+# composer.lock

Concrete5.gitignore

@@ -1,3 +1,3 @@
 config/site.php
 files/cache/*
-files/tmp/*
+files/tmp/*

Coq.gitignore

@@ -1,4 +1,3 @@
 *.vo
 *.glob
 *.v.d
-

Dart.gitignore

@@ -1,4 +1,16 @@
-.DS_Store
-packages
+// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+packages/
 .project
-pubspec.lock
+.buildlog
+*.js_
+*.js.deps
+*.js.map
+
+// Include when developing application packages
+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,4 @@ __history
 *.map
 *.exe
 *.dll
-bin/*
+bin/*

Drupal.gitignore

@@ -34,4 +34,4 @@ xmlrpc.php
 /modules
 /profiles
 /scripts
-/themes
+/themes

EPiServer.gitignore

@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config

Erlang.gitignore

@@ -2,4 +2,5 @@
 deps
 *.o
 *.beam
-*.plt
+*.plt
+erl_crash.dump

ExpressionEngine.gitignore

@@ -8,8 +8,12 @@ images/member_photos/
 images/signature_attachments/
 images/pm_attachments/
 
+# For security do not publish the following files
+system/expressionengine/config/database.php
+system/expressionengine/config/config.php
+
 # Caches
 sized/
 thumbs/
 _thumbs/
-*/expressionengine/cache/*
+*/expressionengine/cache/*

Fancy.gitignore

@@ -0,0 +1,2 @@
+*.rbc
+*.fyc

Finale.gitignore

@@ -11,4 +11,3 @@
 # Some versions of Finale have a bug and randomly save extra copies of
 # the music source as "<Filename> copy.mus"
 *copy.mus
-

ForceDotCom.gitignore

@@ -1,4 +1,4 @@
 .project
 .settings
 salesforce.schema
-Referenced Packages
+Referenced Packages

GWT.gitignore

@@ -14,4 +14,3 @@ gwt-unitCache/
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
-

Global/Archives.gitignore

@@ -9,6 +9,7 @@
 *.bz2
 *.xz
 *.lzma
+*.cab
 
 #packing-only formats
 *.iso
@@ -21,3 +22,6 @@
 *.egg
 *.deb
 *.rpm
+*.msi
+*.msm
+*.msp

Global/CVS.gitignore

@@ -1,4 +1,4 @@
 /CVS/*
 */CVS/*
 .cvsignore
-*/.cvsignore
+*/.cvsignore

Global/Eclipse.gitignore

@@ -1,6 +1,6 @@
 *.pydevproject
-.project
 .metadata
+.gradle
 bin/**
 tmp/**
 tmp/**/*
@@ -9,7 +9,6 @@ tmp/**/*
 *.swp
 *~.nib
 local.properties
-.classpath
 .settings/
 .loadpath
 
@@ -24,3 +23,6 @@ local.properties
 
 # PDT-specific
 .buildpath
+
+# TeXlipse plugin
+.texlipse

Global/Espresso.gitignore

@@ -1 +1 @@
-*.esproj
+*.esproj

Global/FlexBuilder.gitignore

@@ -1,2 +1,2 @@
 bin/
-bin-debug/
+bin-debug/

Global/JetBrains.gitignore

@@ -0,0 +1,20 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+
+## Directory-based project format
+.idea/
+# if you remove the above rule, at least ignore user-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# and these sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/

Global/KDevelop4.gitignore

@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/

Global/Linux.gitignore

@@ -1,3 +1 @@
-.*
-!.gitignore
 *~

Global/Matlab.gitignore

@@ -12,5 +12,5 @@
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation	
+# Simulink Code Generation
 slprj/

Global/NotepadPP.gitignore

@@ -0,0 +1,2 @@
+# Notepad++ backups #
+*.bak

Global/OSX.gitignore

@@ -1,8 +1,9 @@
 .DS_Store
 .AppleDouble
 .LSOverride
-Icon
 
+# Icon must ends with two \r.
+Icon
 
 # Thumbnails
 ._*

Global/SASS.gitignore

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

Global/SBT.gitignore

@@ -4,4 +4,6 @@
 target/
 lib_managed/
 src_managed/
-project/boot/
+project/boot/
+.history
+.cache

Global/SublimeText.gitignore

@@ -1,2 +1,6 @@
-# SublimeText project files
+# workspace files are user-specific
 *.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project

Global/Tags.gitignore

@@ -1,5 +1,14 @@
-# Ignore tags created by etags and ctags
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
 !TAGS/
 tags
 !tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
+

Global/Vagrant.gitignore

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