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

exalted · exalted · commit d08fbbd0d473 · 2012-08-22T12:22:38.000+02:00
diff --git 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
diff --git a/Erlang.gitignore b/Erlang.gitignore
@@ -1,6 +1,5 @@
 .eunit
 deps
-priv
 *.o
 *.beam
 *.plt
diff --git a/Global/Archives.gitignore b/Global/Archives.gitignore
@@ -6,6 +6,7 @@
 *.zip
 *.gz
 *.bzip
+*.bz2
 *.xz
 *.lzma
 
@@ -19,4 +20,4 @@
 *.gem
 *.egg
 *.deb
-*.rpm
+*.rpm
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+Icon
 
 # Thumbnails
 ._*
diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore
@@ -1,5 +1,5 @@
 # Windows image file caches
-Thumbs.db 
+Thumbs.db
 ehthumbs.db
 
 # Folder config file
diff --git 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
diff --git 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

-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 .eunit
 deps
 -priv
 *.o
 *.beam
 *.plt