Permalink
Browse files

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

  • Loading branch information...
2 parents 6f6c2ea + c160ad9 commit d08fbbd0d4739cde05a2dd7e8e8afa138586f785 @exalted exalted committed Aug 22, 2012
Showing with 13 additions and 6 deletions.
  1. +2 −0 CSharp.gitignore
  2. +0 −1 Erlang.gitignore
  3. +2 −1 Global/Archives.gitignore
  4. +1 −0 Global/OSX.gitignore
  5. +1 −0 Global/PhPStorm.gitignore
  6. +1 −1 Global/Windows.gitignore
  7. +4 −3 Python.gitignore
  8. +2 −0 VB.Net.gitignore
View
@@ -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
View
@@ -1,6 +1,5 @@
.eunit
deps
-priv
*.o
*.beam
*.plt
@@ -6,6 +6,7 @@
*.zip
*.gz
*.bzip
+*.bz2
*.xz
*.lzma
@@ -19,4 +20,4 @@
*.gem
*.egg
*.deb
-*.rpm
+*.rpm
View
@@ -1,4 +1,5 @@
.DS_Store
+Icon
# Thumbnails
._*
@@ -0,0 +1 @@
+.idea/
View
@@ -1,5 +1,5 @@
# Windows image file caches
-Thumbs.db
+Thumbs.db
ehthumbs.db
# Folder config file
View
@@ -26,9 +26,10 @@ pip-log.txt
.tox
nosetests.xml
-#Translations
+# Translations
*.mo
-#Mr Developer
+# Mr Developer
.mr.developer.cfg
-
+.project
+.pydevproject
View
@@ -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

0 comments on commit d08fbbd

Please sign in to comment.