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

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

Erlang.gitignore

 .eunit
 deps
-priv
 *.o
 *.beam
 *.plt
\ No newline at end of file

Global/Archives.gitignore

@@ -6,6 +6,7 @@
 *.zip
 *.gz
 *.bzip
+*.bz2
 *.xz
 *.lzma
 
@@ -19,4 +20,4 @@
 *.gem
 *.egg
 *.deb
-*.rpm
+*.rpm
\ No newline at end of file

Global/OSX.gitignore

 .DS_Store
+Icon
 
 # Thumbnails
 ._*

Global/PhPStorm.gitignore

+.idea/
\ No newline at end of file

Global/Windows.gitignore

 # Windows image file caches
-Thumbs.db 
+Thumbs.db
 ehthumbs.db
 
 # Folder config file

Python.gitignore

@@ -26,9 +26,10 @@ pip-log.txt
 .tox
 nosetests.xml
 
-#Translations
+# Translations
 *.mo
 
-#Mr Developer
+# Mr Developer
 .mr.developer.cfg
-
+.project
+.pydevproject

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