Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
roryhardy committed Apr 15, 2012
2 parents bd20a55 + 1a188f2 commit 8cc0784
Show file tree
Hide file tree
Showing 8 changed files with 108 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CSharp.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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
2 changes: 2 additions & 0 deletions Global/Tags.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Ignore tags created by etags and ctags
TAGS
!TAGS/
tags
!tags/
10 changes: 7 additions & 3 deletions LaTeX.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
*.acn
*.acr
*.alg
*.aux
*.bbl
*.blg
Expand All @@ -13,6 +16,9 @@
*.lof
*.log
*.lot
*.maf
*.mtc
*.mtc0
*.nav
*.nlo
*.out
Expand All @@ -22,6 +28,4 @@
*.synctex.gz
*.toc
*.vrb
*.maf
*.mtc
*.mtc0
*.xdy
13 changes: 13 additions & 0 deletions Opa.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
_build
_tracks

opa-debug-js

*.opp
*.opx
*.opx.broken
*.dump
*.api
*.api-txt
*.exe
*.log
1 change: 0 additions & 1 deletion PlayFramework.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ logs
precompiled
tmp
test-result
eclipse
server.pid
1 change: 1 addition & 0 deletions Python.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pip-log.txt
# Unit test / coverage reports
.coverage
.tox
nosetests.xml

#Translations
*.mo
Expand Down
1 change: 1 addition & 0 deletions SugarCRM.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
82 changes: 82 additions & 0 deletions Target3001.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# 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

0 comments on commit 8cc0784

Please sign in to comment.