Merge branch 'master' of https://github.com/github/gitignore

2012-08-22 12:22:38 +02:00 · 2012-08-22 12:22:38 +02:00 · d08fbbd0d4
commit d08fbbd0d4
parent 6f6c2eac58 c160ad912a
8 changed files with 13 additions and 6 deletions
--- a/CSharp.gitignore
+++ b/CSharp.gitignore
@ -32,6 +32,7 @@ x64/
 *.tli
 *.tlh
 *.tmp
+*.log
 *.vspscc
 *.vssscc
 .builds
@ -46,6 +47,7 @@ ipch/
 # Visual Studio profiler
 *.psess
 *.vsp
+*.vspx

 # Guidance Automation Toolkit
 *.gpState
--- a/Erlang.gitignore
+++ b/Erlang.gitignore
@ -1,6 +1,5 @@
 .eunit
 deps
-priv
 *.o
 *.beam
 *.plt
--- a/Global/Archives.gitignore
+++ b/Global/Archives.gitignore
@ -6,6 +6,7 @@
 *.zip
 *.gz
 *.bzip
+*.bz2
 *.xz
 *.lzma

--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@ -1,4 +1,5 @@
 .DS_Store
+Icon

 # Thumbnails
 ._*
--- a/Global/PhPStorm.gitignore
+++ b/Global/PhPStorm.gitignore
@ -0,0 +1 @@
+.idea/
--- a/Python.gitignore
+++ b/Python.gitignore
@ -26,9 +26,10 @@ pip-log.txt
 .tox
 nosetests.xml

-#Translations
+# Translations
 *.mo

-#Mr Developer
+# Mr Developer
 .mr.developer.cfg
-
+.project
+.pydevproject
--- a/VB.Net.gitignore
+++ b/VB.Net.gitignore
@ -33,6 +33,7 @@ x64/
 *.tli
 *.tlh
 *.tmp
+*.log
 *.vspscc
 *.vssscc
 .builds
@ -47,6 +48,7 @@ ipch/
 # Visual Studio profiler
 *.psess
 *.vsp
+*.vspx

 # Guidance Automation Toolkit
 *.gpState