Merge https://github.com/github/gitignore

Conflicts:
	Global/VisualStudio.gitignore

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/
+settings.php
+/README.txt
+/CHANGELOG.txt
+/COPYRIGHT.txt
+/INSTALL*.txt
+/LICENSE.txt
+/MAINTAINERS.txt
+/UPGRADE.txt
+sites/all/README.txt
+sites/all/modules/README.txt
+sites/all/themes/README.txt

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/SVN.gitignore

+/.svn/*
+*/.svn/*
\ No newline at end of file

Global/Tags.gitignore

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

Global/TextMate.gitignore

 *.tmproj
+*.tmproject
 tmtags

Global/VisualStudio.gitignore

@@ -8,14 +8,11 @@
 # Build results
 [Dd]ebug/
 [Rr]elease/
-*.ncb
-*.aps
-*.obj
-.builds
 *_i.c
 *_p.c
 *.ilk
 *.meta
+*.obj
 *.pch
 *.pdb
 *.pgc
@@ -27,6 +24,18 @@
 *.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*

LaTeX.gitignore

@@ -14,4 +14,6 @@
 *.fdb_latexmk
 *.pdfsync
 *.synctex.gz
-
+*.nav
+*.snm
+*.vrb

OCaml.gitignore

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

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

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