Merging upstream

biu7 · Nov 27, 2013 · 412d690 · 412d690
2 parents 6ae5f35 + a6dc172
commit 412d690
Show file tree

Hide file tree

Showing 103 changed files with 1,180 additions and 622 deletions.
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/Ada.gitignore b/Ada.gitignore
@@ -0,0 +1,5 @@
+# Object file
+*.o
+
+# Ada Library Information
+*.ali
diff --git a/Agda.gitignore b/Agda.gitignore
@@ -0,0 +1 @@
+*.agdai
diff --git a/Android.gitignore b/Android.gitignore
@@ -12,19 +12,12 @@
 bin/
 gen/
 
+# Ignore gradle files
+.gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Eclipse project files
-.classpath
-.project
-
 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
-
diff --git a/ArchLinuxPackages.gitignore b/ArchLinuxPackages.gitignore
@@ -0,0 +1,7 @@
+*.tar
+*.tar.*
+*.log
+*.log.*
+*.sig
+pkg/
+src/
diff --git a/Autotools.gitignore b/Autotools.gitignore
@@ -11,3 +11,4 @@ Makefile.in
 /depcomp
 /install-sh
 /missing
+/stamp-h1
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,6 +1,8 @@
 # Object files
 *.o
 *.ko
+*.obj
+*.elf
 
 # Libraries
 *.lib
@@ -16,3 +18,6 @@
 *.exe
 *.out
 *.app
+*.i*86
+*.x86_64
+*.hex
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,3 +1,34 @@
-Since this repo includes a large and diverse number of programming languages, frameworks, editors, and ecosystems, it's *very helpful* if you can provide a link to information supporting your pull request. Up-to-date, canonical documentation that mentions the files to be ignored is best.
+# Contributing guidelines
 
-This ensures we can efficiently go through pull requests and keep quality high.
+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/ChefCookbook.gitignore b/ChefCookbook.gitignore
@@ -0,0 +1,17 @@
+.vagrant
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml
diff --git a/CodeIgniter.gitignore b/CodeIgniter.gitignore
@@ -3,3 +3,4 @@
 */logs/!index.html
 */cache/*
 */cache/!index.html
+*/cache/!.htaccess
diff --git a/CommonLisp.gitignore b/CommonLisp.gitignore
@@ -0,0 +1,3 @@
+*.FASL
+*.fasl
+*.lisp-temp
diff --git a/Composer.gitignore b/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
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/Dart.gitignore b/Dart.gitignore
@@ -1,4 +1,11 @@
-.DS_Store
-packages
-.project
-pubspec.lock
+// Don’t commit the following files and directories created by pub and dart2js
+packages/
+*.js_
+*.js.deps
+*.js.map
+
+// Include when developing application packages
+pubspec.lock 
+
+// Avoid committing generated JavaScript files
+*.dart.js
diff --git a/Delphi.gitignore b/Delphi.gitignore
@@ -1,5 +1,5 @@
 *.dcu
-*.~*~
+*.~*
 *.local
 *.identcache
 __history
@@ -11,4 +11,4 @@ __history
 *.dcp
 *.so
 *.apk
-bin/*
+bin/*
diff --git a/Django.gitignore b/Django.gitignore
diff --git a/Drupal.gitignore b/Drupal.gitignore
@@ -8,7 +8,6 @@ sites/*/files
 sites/*/private
 
 # Ignore default text files
-.htaccess
 robots.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt
@@ -22,6 +21,7 @@ sites/all/modules/README.txt
 sites/all/themes/README.txt
 
 # Ignore everything but the "sites" folder ( for non core developer )
+.htaccess
 web.config
 authorize.php
 cron.php
@@ -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/Elisp.gitignore b/Elisp.gitignore
@@ -0,0 +1,2 @@
+# Compiled
+*.elc
diff --git a/ExpressionEngine.gitignore b/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/*
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
@@ -15,3 +15,14 @@ gwt-unitCache/
 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/
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/BricxCC.gitignore b/Global/BricxCC.gitignore
@@ -0,0 +1,4 @@
+# Bricx Command Center IDE
+# http://bricxcc.sourceforge.net
+*.bak
+*.sym
diff --git a/Global/CVS.gitignore b/Global/CVS.gitignore
@@ -1,4 +1,4 @@
 /CVS/*
 */CVS/*
 .cvsignore
-*/.cvsignore
+*/.cvsignore
diff --git a/Global/Cloud9.gitignore b/Global/Cloud9.gitignore
@@ -0,0 +1,2 @@
+# Cloud9 IDE - http://c9.io
+.c9revisions
diff --git a/Global/DartEditor.gitignore b/Global/DartEditor.gitignore
@@ -0,0 +1,2 @@
+.project
+.buildlog
diff --git a/Global/Dreamweaver.gitignore b/Global/Dreamweaver.gitignore
@@ -0,0 +1,3 @@
+# DW Dreamweaver added files
+_notes
+dwsync.xml
diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
@@ -1,15 +1,13 @@
 *.pydevproject
-.project
 .metadata
-bin/**
-tmp/**
-tmp/**/*
+.gradle
+bin/
+tmp/
 *.tmp
 *.bak
 *.swp
 *~.nib
 local.properties
-.classpath
 .settings/
 .loadpath
 
@@ -24,3 +22,6 @@ local.properties
 
 # PDT-specific
 .buildpath
+
+# TeXlipse plugin
+.texlipse
diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore
@@ -1,12 +1,23 @@
+# -*- mode: gitignore; -*-
 *~
 \#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
-.elc
+*.elc
 auto-save-list
 tramp
 .\#*
 
 # Org-mode
 .org-id-locations
 *_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
diff --git a/Global/Ensime.gitignore b/Global/Ensime.gitignore
@@ -0,0 +1,3 @@
+# Ensime specific
+.ensime
+.ensime_lucene/
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/
-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    *.tar
+    *.tar.*
+    *.log
+    *.log.*
+    *.sig
+    pkg/
+    src/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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