Merged upstream master

Android.gitignore

@@ -8,5 +8,9 @@
 # Java class files
 *.class
 
-# generated GUI files
-*R.java
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties

Django.gitignore

@@ -1,3 +1,4 @@
 *.log
 *.pot
+*.pyc
 local_settings.py

Drupal.gitignore

@@ -3,7 +3,6 @@ sites/default/private
 sites/default/settings.php
 cache/
 files/
-settings.php
 /README.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt

Global/Archives.gitignore

@@ -1,12 +1,22 @@
 # It's better to unpack these files and commit the raw source because
 # git has its own built in compression methods.
 *.7z
-*.dmg
-*.gz
-*.iso
 *.jar
 *.rar
-*.tar
-*.tar.gz
 *.zip
+*.gz
 *.bzip
+*.xz
+*.lzma
+
+#packing-only formats
+*.iso
+*.tar
+
+#package management formats
+*.dmg
+*.xpi
+*.gem
+*.egg
+*.deb
+*.rpm

Global/Linux.gitignore

@@ -1,7 +1,6 @@
 .*
 !.gitignore
 *~
-*.sw[a-p]
 
 # KDE
 .directory

Global/NetBeans.gitignore

@@ -1 +1,2 @@
 nbproject/
+nbactions.xml

Global/VisualStudio.gitignore

@@ -6,9 +6,24 @@
 *.user
 
 # Build results
-Debug/
-Release/
+[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
@@ -39,10 +54,8 @@ DocProject/Help/html
 publish
 
 # Others
-bin
-Bin
-obj
-Obj
+[Bb]in
+[Oo]bj
 sql
 TestResults
 *.Cache
@@ -51,3 +64,9 @@ stylecop.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML

Haskell.gitignore

@@ -1,3 +1,5 @@
 dist
 *.o
 *.hi
+*.chi
+*.chs.h

LaTeX.gitignore

@@ -1,14 +1,18 @@
 *.aux
 *.bbl
 *.blg
+*.dvi
 *.glg
 *.glo
 *.gls
 *.idx
 *.ilg
 *.ind
 *.ist
+*.lof
 *.log
+*.lot
+*.nlo
 *.out
 *.toc
 *.fdb_latexmk

Python.gitignore

@@ -8,6 +8,8 @@ build
 eggs
 parts
 bin
+var
+sdist
 develop-eggs
 .installed.cfg
 
@@ -17,3 +19,9 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg

Ruby.gitignore

@@ -1,17 +1,16 @@
+*.gem
+*.rbc
+.bundle
+.config
 coverage
-rdoc
+InstalledFiles
+lib/bundler/man
 pkg
+rdoc
+spec/reports
 test/tmp
 test/version_tmp
 tmp
-pkg
-*.gem
-*.rbc
-lib/bundler/man
-spec/reports
-.config
-InstalledFiles
-.bundle
 
 # YARD artifacts
 .yardoc

Wordpress.gitignore

@@ -1,11 +1,35 @@
 .htaccess
+wp-activate.php
+wp-app.php
+wp-atom.php
+wp-blog-header.php
+wp-comments-post.php
+wp-commentsrss2.php
+wp-config-sample.php
 wp-config.php
-wp-content/backup-db/*
-wp-content/cache/*
-wp-content/cache/supercache/*
+wp-cron.php
+wp-feed.php
+wp-links-opml.php
+wp-load.php
+wp-login.php
+wp-mail.php
+wp-pass.php
+wp-rdf.php
+wp-register.php
+wp-rss.php
+wp-rss2.php
+wp-settings.php
+wp-signup.php
+wp-trackback.php
+xmlrpc.php
+wp-admin/
+wp-includes/
+wp-content/uploads/
 wp-content/upgrade/*
+wp-content/backup-db/*
 wp-content/advanced-cache.php
 wp-content/wp-cache-config.php
-wp-content/uploads/
+wp-content/cache/*
+wp-content/cache/supercache/*
 sitemap.xml
 sitemap.xml.gz

ZendFramework.gitignore

@@ -0,0 +1,6 @@
+INSTALL.txt
+LICENSE.txt
+README.txt
+demos/
+extras/documentation
+