Merge remote-tracking branch 'upstream/master'

CSharp.gitignore

 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-bin
-obj
+[Bb]in/
+[Oo]bj/
 
 # mstest test results
 TestResults
\ No newline at end of file

Global/Tags.gitignore

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

LaTeX.gitignore

+*.acn
+*.acr
+*.alg
 *.aux
 *.bbl
 *.blg
@@ -13,6 +16,9 @@
 *.lof
 *.log
 *.lot
+*.maf
+*.mtc
+*.mtc0
 *.nav
 *.nlo
 *.out
@@ -22,6 +28,4 @@
 *.synctex.gz
 *.toc
 *.vrb
-*.maf
-*.mtc
-*.mtc0
+*.xdy

Opa.gitignore

+_build
+_tracks
+
+opa-debug-js
+
+*.opp
+*.opx
+*.opx.broken
+*.dump
+*.api
+*.api-txt
+*.exe
+*.log

PlayFramework.gitignore

@@ -12,5 +12,4 @@ logs
 precompiled
 tmp
 test-result
-eclipse
 server.pid

Python.gitignore

@@ -19,6 +19,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
+nosetests.xml
 
 #Translations
 *.mo

SugarCRM.gitignore

@@ -22,6 +22,7 @@ cache/xml/*
 custom/history/*
 custom/modulebuilder/*
 custom/working/*
+custom/modules/*/Ext/
 # Custom configuration should also be ignored.
 /config.php
 /config_override.php

Target3001.gitignore

+# Ignore list for Target 3001!, a PCB layout tool
+
+# mutex file
+*.T300[01]OPEN
+
+# Drill output
+*.DRL
+*.BHR
+BOHRPICT.3001
+
+# Backup files
+# (see http://server.ibfriedrich.com/wiki/ibfwikide/index.php?title=Backup)
+BackupFiles
+*.BK?
+*_w?.T300[01]
+*_m?.T300[01]
+*_m??.T300[01]
+
+# Autosave files
+*.T300[01]?
+
+# Gerber output
+*.Apr
+*.BLN
+*.Bot
+*.Drill
+*.GER
+*.Hole
+*.Info
+*.L*
+*.NamesBot
+*.NamesTop
+*.Outline
+*.PadStack*
+*.PasteBot
+*.PasteTop
+*.PosiBot
+*.PosiTop
+*.SB
+*.Special*
+*.ST
+*.StopBot
+*.StopTop
+*.Tool
+*.Top
+*.ValuesBot
+*.ValuesTop
+*.Whl
+
+# production formats
+*.cnc
+*.fab
+*.cad
+*.GDS
+*.exc
+excellon.txt
+*.stk
+*.ncp
+*.pcb
+*.cbt
+*.vhf
+*.iso
+
+# exchange formats
+*.DXF
+*.PS
+*.TIF
+*.NET
+*.PLT
+*.HPGL
+*.emn
+*.stp
+*.tgr
+*.dif
+*.emp
+
+# cable loom
+*.dsi
+*.pnm
+*.wrl
+*.ADPT
+*.AZO