Merge remote-tracking branch 'github/master'

Autotools.gitignore

-
 # http://www.gnu.org/software/automake
 
 Makefile.in

C++.gitignore

-# compiled object files
+# Compiled Object files
+*.slo
+*.lo
 *.o
 
-# compiled dynamic libraries
+# Compiled Dynamic libraries
 *.so
 
-# compiled static libraries
+# Compiled Static libraries
+*.lai
+*.la
 *.a

CFWheels.gitignore

+# unpacked plugin folders
+plugins/**/*
+
+# files directory where uploads go
+files
+
+# DBMigrate plugin: generated SQL
+db/sql
+
+# AssetBundler plugin: generated bundles
+javascripts/bundles
+stylesheets/bundles

CSharp.gitignore

@@ -5,3 +5,12 @@ _ReSharper*
 bin
 obj
 
+# user settings
+*.user
+*.suo
+
+# if you have pictures, windows will likely create those annoying index files
+Thumbs.db
+
+# mstest test results
+TestResults
\ No newline at end of file

CakePHP.gitignore

@@ -2,4 +2,4 @@ tmp/*
 config/database.php
 app/tmp/*
 app/config/database.php
-
+!empty
\ No newline at end of file

CodeIgniter.gitignore

 */config/database.php
 */system/logs/log-*.php
 */system/cache/*
-*/systen/cache/!index.html
+*/system/cache/!index.html

Coq.gitignore

+*.vo
+*.glob
+*.v.d
+

Drupal.gitignore

+sites/default/files
+sites/default/private
+sites/default/settings.php
+cache/
+files/
+/README.txt
+/CHANGELOG.txt
+/COPYRIGHT.txt
+/INSTALL*.txt
+/LICENSE.txt
+/MAINTAINERS.txt
+/UPGRADE.txt
+robots.txt
+sites/all/README.txt
+sites/all/modules/README.txt
+sites/all/themes/README.txt
+.htaccess
+
+#for non core developer
+#only include "sites" folder without exclusions before
+cron.php
+index.php
+install.php
+update.php
+xmlrpc.php
+/includes
+/misc
+/modules     
+/profiles
+/scripts
+/themes
+

ExpressionEngine.gitignore

+.DS_Store
+
+# Images
+images/avatars/
+images/captchas/
+images/smileys/
+images/member_photos/
+images/signature_attachments/
+images/pm_attachments/
+
+# Caches
+sized/
+thumbs/
+_thumbs/
+*/expressionengine/cache/*
\ No newline at end of file

Global/Archives.gitignore

-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
+# It's better to unpack these files and commit the raw source because
+# git has its own built in compression methods.
 *.7z
 *.dmg
 *.gz
@@ -9,4 +9,4 @@
 *.tar
 *.tar.gz
 *.zip
-*.bzip
\ No newline at end of file
+*.bzip

Global/CVS.gitignore

+/CVS/*
+*/CVS/*
+.cvsignore
+*/.cvsignore
\ No newline at end of file

Global/Emacs.gitignore

@@ -2,3 +2,6 @@
 \#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
+.elc
+auto-save-list
+tramp

Global/Linux.gitignore

 .*
+!.gitignore
 *~
 *.sw[a-p]
 
-#KDE
+# KDE
 .directory

Global/Mercurial.gitignore

+/.hg/*
+*/.hg/*
+.hgignore
\ No newline at end of file

Global/OSX.gitignore

-.DS_Store?
+.DS_Store
 Icon?
 
 # Thumbnails
 ._*
 
-# ack & vim swap files
-.ackrc
-*.swp
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes

Global/SVN.gitignore

+.svn/

Global/Tags.gitignore

+# Ignore tags created by etags and ctags
+TAGS
+tags

Global/TextMate.gitignore

 *.tmproj
+*.tmproject
 tmtags

Global/VisualStudio.gitignore

@@ -6,21 +6,56 @@
 *.user
 
 # Build results
-Debug/
-Release/
-*.ncb
-*.aps
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
 *.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
 .builds
 
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
 # ReSharper is a .NET coding add-in
 _ReSharper*
 
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
 # Others
-bin
-Bin
-obj
-Obj
+[Bb]in
+[Oo]bj
 sql
 TestResults
 *.Cache
@@ -28,3 +63,4 @@ ClientBin
 stylecop.*
 ~$*
 *.dbmdl
+Generated_Code #added for RIA/Silverlight projects

Global/Windows.gitignore

-#Windows images caches
+# Windows image file caches
 Thumbs.db 
 
-#Folder config file
-Desktop.ini
\ No newline at end of file
+# Folder config file
+Desktop.ini

Global/vim.gitignore

 .*.sw[a-z]
+*.un~
+Session.vim

Haskell.gitignore

+dist
+*.o
+*.hi
+*.chi
+*.chs.h

Jboss.gitignore

+jboss/server/all/deploy/project.ext
+jboss/server/default/deploy/project.ext
+jboss/server/minimal/deploy/project.ext
+jboss/server/all/log/*.log
+jboss/server/all/tmp/**/*
+jboss/server/all/data/**/*
+jboss/server/all/work/**/*
+jboss/server/default/log/*.log
+jboss/server/default/tmp/**/*
+jboss/server/default/data/**/*
+jboss/server/default/work/**/*
+jboss/server/minimal/log/*.log
+jboss/server/minimal/tmp/**/*
+jboss/server/minimal/data/**/*
+jboss/server/minimal/work/**/*

LaTeX.gitignore

 *.aux
 *.bbl
 *.blg
+*.dvi
 *.glg
 *.glo
 *.gls
@@ -8,10 +9,15 @@
 *.ilg
 *.ind
 *.ist
+*.lof
 *.log
+*.lot
+*.nlo
 *.out
 *.toc
 *.fdb_latexmk
 *.pdfsync
 *.synctex.gz
-
+*.nav
+*.snm
+*.vrb

LemonStand.gitignore

+boot.php
+index.php
+install.php
+/config/*
+!/config/config.php
+/controllers/*
+/init/*
+/logs/*
+/phproad/*
+/temp/*
+/uploaded/*
+/installer_files/*
+/modules/backend/*
+/modules/blog/*
+/modules/cms/*
+/modules/core/*
+/modules/session/*
+/modules/shop/*
+/modules/system/*
+/modules/users/*
\ No newline at end of file

Lilypond.gitignore

+*.pdf
+*.ps
+*.midi
+*.mid
+*.log
+*~

OCaml.gitignore

+*.annot
+*.cmo
+*.cma
+*.cmi
+*.a
+*.o
+*.cmx
+*.cmxs
+*.cmxa

Objective-C.gitignore

-# xcode
+# Xcode
 build/*
 *.pbxuser
 !default.pbxuser

PlayFramework.gitignore

+# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
+# Ignore all dotfiles...
+.*
+# except for .gitignore
+!.gitignore
+
+# Ignore Play! working directory #
+db
+eclipse
+log
+logs
+tmp
+test-result
+eclipse
+server.pid

Qooxdoo.gitignore

+cache
+cache-downloads
+inspector
+api
+source/inspector.html

Rails.gitignore

@@ -12,3 +12,6 @@ capybara-*.html
 /coverage/
 /spec/tmp/*
 **.orig
+config/*.yml
+rerun.txt
+pickle-email-*.html
\ No newline at end of file

SeamGen.gitignore

+/bootstrap/data
+/bootstrap/tmp
+/classes/			# all class files
+/dist/				# contains generated war files for deployment
+/exploded-archives/		# war content generation during deploy (or explode)
+/test-build/			# test compilation (ant target for Seam)
+/test-output/			# test results
+/test-report/			# test report generation for, e.g., Hudson
+/target/			# maven output folder
+temp-testng-customsuite.xml	# generated when running test cases under Eclipse
+
+# Thanks to @VonC and @kraftan for their helpful answers on a related question
+# on StackOverflow.com:
+# http://stackoverflow.com/questions/4176687
+# /what-is-the-recommended-source-control-ignore-pattern-for-seam-projects

Symfony.gitignore

@@ -4,3 +4,8 @@ web/uploads/*
 config/databases.yml
 config/propel.ini
 data/sql
+lib/filter/doctrine/base/Base*
+lib/form/doctrine/base/Base*
+lib/model/doctrine/base/Base*
+lib/model/om/*
+lib/model/map/*
\ No newline at end of file

Symfony2.gitignore

+*/logs/*
+*/cache/*
+web/uploads/*
+web/bundles/*

Tasm.gitignore

+#  Object Files
+*.OBJ
+
+# List Files
+*.LST
+
+# Map files
+*.MAP
+
+# Executable files
+*.EXE

VB.Net.gitignore

+# Build and Object Folders
+bin/
+obj/
+
+#User Specific Files
+*.user
+*.suo
+
+#Resource Caches
+_ReSharper.*
+*.sln.cache
\ No newline at end of file

Waf.gitignore

+# for projects that use Waf for building: http://code.google.com/p/waf/
+.waf-*
+.lock-*

Wordpress.gitignore

+.htaccess
+wp-config.php
+wp-content/backup-db/*
+wp-content/cache/*
+wp-content/cache/supercache/*
+wp-content/upgrade/*
+wp-content/advanced-cache.php
+wp-content/wp-cache-config.php
+wp-content/uploads/
+sitemap.xml
+sitemap.xml.gz
\ No newline at end of file

Yii.gitignore

+assets/
+protected/runtime/
+themes/classic/views/
\ No newline at end of file

ZendFramework.gitignore

+INSTALL.txt
+LICENSE.txt
+README.txt
+demos/
+extras/documentation
+

gcov.gitignore

+# gcc coverage testing tool files
+
+*.gcno
+*.gcda
+*.gcov