Merge branch 'master' into patch-1

Michael Gerbush · Michael Gerbush · commit 95075cccba0e · 2013-11-07T13:04:32.000-06:00
Conflicts:
	Objective-C.gitignore
diff --git a/Actionscript.gitignore b/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.
diff --git a/Android.gitignore b/Android.gitignore
@@ -27,4 +27,3 @@ proguard/
 *.ipr
 *.iws
 .idea/
-
diff --git a/C++.gitignore b/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
diff --git a/C.gitignore b/C.gitignore
@@ -1,5 +1,7 @@
 # Object files
 *.o
+*.ko
+*.obj
 
 # Libraries
 *.lib
diff --git a/CONTRIBUTING.md b/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.
diff --git a/CakePHP.gitignore b/CakePHP.gitignore
@@ -4,4 +4,4 @@ tmp/*
 app/tmp/*
 app/[Cc]onfig/core.php
 app/[Cc]onfig/database.php
-!empty
+!empty
diff --git a/Concrete5.gitignore b/Concrete5.gitignore
@@ -1,3 +1,3 @@
 config/site.php
 files/cache/*
-files/tmp/*
+files/tmp/*
diff --git a/Coq.gitignore b/Coq.gitignore
@@ -1,4 +1,3 @@
 *.vo
 *.glob
 *.v.d
-
diff --git a/Delphi.gitignore b/Delphi.gitignore
@@ -7,4 +7,4 @@ __history
 *.map
 *.exe
 *.dll
-bin/*
+bin/*
diff --git a/Drupal.gitignore b/Drupal.gitignore
@@ -34,4 +34,4 @@ xmlrpc.php
 /modules
 /profiles
 /scripts
-/themes
+/themes
diff --git a/EPiServer.gitignore b/EPiServer.gitignore
@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config
diff --git a/ExpressionEngine.gitignore b/ExpressionEngine.gitignore
@@ -12,4 +12,4 @@ images/pm_attachments/
 sized/
 thumbs/
 _thumbs/
-*/expressionengine/cache/*
+*/expressionengine/cache/*
diff --git a/Fancy.gitignore b/Fancy.gitignore
@@ -0,0 +1,2 @@
+*.rbc
+*.fyc
diff --git a/Finale.gitignore b/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
-
diff --git a/ForceDotCom.gitignore b/ForceDotCom.gitignore
@@ -1,4 +1,4 @@
 .project
 .settings
 salesforce.schema
-Referenced Packages
+Referenced Packages
diff --git a/GWT.gitignore b/GWT.gitignore
@@ -14,4 +14,3 @@ gwt-unitCache/
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
-
diff --git a/Global/Archives.gitignore b/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
diff --git a/Global/CVS.gitignore b/Global/CVS.gitignore
@@ -1,4 +1,4 @@
 /CVS/*
 */CVS/*
 .cvsignore
-*/.cvsignore
+*/.cvsignore
diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
@@ -1,6 +1,7 @@
 *.pydevproject
 .project
 .metadata
+.gradle
 bin/**
 tmp/**
 tmp/**/*
@@ -24,3 +25,6 @@ local.properties
 
 # PDT-specific
 .buildpath
+
+# TeXlipse plugin
+.texlipse
diff --git a/Global/Espresso.gitignore b/Global/Espresso.gitignore
@@ -1 +1 @@
-*.esproj
+*.esproj
diff --git a/Global/FlexBuilder.gitignore b/Global/FlexBuilder.gitignore
@@ -1,2 +1,2 @@
 bin/
-bin-debug/
+bin-debug/
diff --git a/Global/IntelliJ.gitignore b/Global/IntelliJ.gitignore
@@ -2,3 +2,4 @@
 *.ipr
 *.iws
 .idea/
+out/
diff --git a/Global/KDevelop4.gitignore b/Global/KDevelop4.gitignore
@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/
diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore
@@ -1,3 +1 @@
-.*
-!.gitignore
 *~
diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore
@@ -12,5 +12,5 @@
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation	
+# Simulink Code Generation
 slprj/
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
@@ -1,8 +1,9 @@
 .DS_Store
 .AppleDouble
 .LSOverride
-Icon
 
+# Icon must ends with two \r.
+Icon
 
 # Thumbnails
 ._*
diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore
@@ -1 +1 @@
-.idea/
+.idea/
diff --git a/Global/SASS.gitignore b/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
diff --git a/Global/SBT.gitignore b/Global/SBT.gitignore
@@ -4,4 +4,6 @@
 target/
 lib_managed/
 src_managed/
-project/boot/
+project/boot/
+.history
+.cache
diff --git a/Global/Tags.gitignore b/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
+
diff --git a/Global/Vagrant.gitignore b/Global/Vagrant.gitignore
@@ -0,0 +1 @@
+.vagrant/
diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore
@@ -7,3 +7,9 @@ Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
diff --git a/Global/vim.gitignore b/Global/vim.gitignore
@@ -1,4 +1,5 @@
-.*.s[a-w][a-z]
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist
diff --git a/Go.gitignore b/Go.gitignore
@@ -20,3 +20,4 @@ _cgo_export.*
 _testmain.go
 
 *.exe
+*.test
diff --git a/Grails.gitignore b/Grails.gitignore
@@ -41,4 +41,3 @@
 
 # other
 *.iws
-
diff --git a/Joomla.gitignore b/Joomla.gitignore
@@ -393,4 +393,4 @@ tmp/*
 configuration.php
 index.php
 joomla.xml
-*.txt
+*.txt
diff --git a/Kohana.gitignore b/Kohana.gitignore
@@ -1,2 +1,2 @@
 application/cache/*
-application/logs/*
+application/logs/*
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 GitHub, Inc.
+Copyright (c) 2013 GitHub, Inc.
 
 Permission is hereby granted,  free of charge,  to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/LaTeX.gitignore b/LaTeX.gitignore
@@ -3,17 +3,24 @@
 *.alg
 *.aux
 *.bbl
+*.bcf
 *.blg
+*-blx.aux
+*-blx.bib
+*.brf
 *.dvi
 *.fdb_latexmk
+*.fls
 *.glg
 *.glo
 *.gls
 *.idx
 *.ilg
 *.ind
 *.ist
+*.loa
 *.lof
+*.lol
 *.log
 *.lot
 *.maf
@@ -24,8 +31,10 @@
 *.out
 *.pdfsync
 *.ps
+*.run.xml
 *.snm
 *.synctex.gz
+*.thm
 *.toc
 *.vrb
 *.xdy
diff --git a/Leiningen.gitignore b/Leiningen.gitignore
@@ -4,3 +4,4 @@ pom.xml
 /classes/
 /targets/
 .lein-deps-sum
+.lein-plugins/
diff --git a/LemonStand.gitignore b/LemonStand.gitignore
@@ -18,4 +18,4 @@ install.php
 /modules/shop/*
 /modules/system/*
 /modules/users/*
-# add content_*.php if you don't want erase client changes to content
+# add content_*.php if you don't want erase client changes to content
diff --git a/Magento.gitignore b/Magento.gitignore
@@ -15,14 +15,18 @@ app/etc/modules/Enterprise_*
 app/etc/modules/Find_Feed.xml
 app/etc/modules/Mage_All.xml
 app/etc/modules/Mage_Api.xml
+app/etc/modules/Mage_Api2.xml
 app/etc/modules/Mage_Authorizenet.xml
 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_Connect.xml
+app/etc/modules/Mage_CurrencySymbol.xml
 app/etc/modules/Mage_Downloadable.xml
 app/etc/modules/Mage_ImportExport.xml
 app/etc/modules/Mage_LoadTest.xml
+app/etc/modules/Mage_Oauth.xml
 app/etc/modules/Mage_PageCache.xml
 app/etc/modules/Mage_Persistent.xml
 app/etc/modules/Mage_Weee.xml
@@ -78,6 +82,7 @@ LICENSE.txt
 LICENSE_EE*
 mage
 media/customer/
+media/dhl/
 media/downloadable/
 media/.htaccess
 media/import/
diff --git a/Node.gitignore b/Node.gitignore
@@ -12,4 +12,4 @@ logs
 results
 
 npm-debug.log
-node_modules
+node_modules
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
diff --git a/Perl.gitignore b/Perl.gitignore
diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
diff --git a/Processing.gitignore b/Processing.gitignore
diff --git a/Python.gitignore b/Python.gitignore
diff --git a/Qt.gitignore b/Qt.gitignore
diff --git a/R.gitignore b/R.gitignore
diff --git a/README.md b/README.md
diff --git a/Rails.gitignore b/Rails.gitignore
diff --git a/RubyMotion.gitignore b/RubyMotion.gitignore
diff --git a/Scala.gitignore b/Scala.gitignore
diff --git a/Sdcc.gitignore b/Sdcc.gitignore
diff --git a/Symfony.gitignore b/Symfony.gitignore
diff --git a/Symfony2.gitignore b/Symfony2.gitignore
diff --git a/Typo3.gitignore b/Typo3.gitignore
diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore
diff --git a/WordPress.gitignore b/WordPress.gitignore
diff --git a/Yii.gitignore b/Yii.gitignore
diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore

-Original file line number
+Diff line change
 *.ipr
 *.iws
 .idea/
+-