Merge branch 'master' of https://github.com/github/gitignore
This commit is contained in:
commit
d08fbbd0d4
@ -32,6 +32,7 @@ x64/
|
|||||||
*.tli
|
*.tli
|
||||||
*.tlh
|
*.tlh
|
||||||
*.tmp
|
*.tmp
|
||||||
|
*.log
|
||||||
*.vspscc
|
*.vspscc
|
||||||
*.vssscc
|
*.vssscc
|
||||||
.builds
|
.builds
|
||||||
@ -46,6 +47,7 @@ ipch/
|
|||||||
# Visual Studio profiler
|
# Visual Studio profiler
|
||||||
*.psess
|
*.psess
|
||||||
*.vsp
|
*.vsp
|
||||||
|
*.vspx
|
||||||
|
|
||||||
# Guidance Automation Toolkit
|
# Guidance Automation Toolkit
|
||||||
*.gpState
|
*.gpState
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
.eunit
|
.eunit
|
||||||
deps
|
deps
|
||||||
priv
|
|
||||||
*.o
|
*.o
|
||||||
*.beam
|
*.beam
|
||||||
*.plt
|
*.plt
|
@ -6,6 +6,7 @@
|
|||||||
*.zip
|
*.zip
|
||||||
*.gz
|
*.gz
|
||||||
*.bzip
|
*.bzip
|
||||||
|
*.bz2
|
||||||
*.xz
|
*.xz
|
||||||
*.lzma
|
*.lzma
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
|
Icon
|
||||||
|
|
||||||
# Thumbnails
|
# Thumbnails
|
||||||
._*
|
._*
|
||||||
|
1
Global/PhPStorm.gitignore
Normal file
1
Global/PhPStorm.gitignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
.idea/
|
@ -26,9 +26,10 @@ pip-log.txt
|
|||||||
.tox
|
.tox
|
||||||
nosetests.xml
|
nosetests.xml
|
||||||
|
|
||||||
#Translations
|
# Translations
|
||||||
*.mo
|
*.mo
|
||||||
|
|
||||||
#Mr Developer
|
# Mr Developer
|
||||||
.mr.developer.cfg
|
.mr.developer.cfg
|
||||||
|
.project
|
||||||
|
.pydevproject
|
||||||
|
@ -33,6 +33,7 @@ x64/
|
|||||||
*.tli
|
*.tli
|
||||||
*.tlh
|
*.tlh
|
||||||
*.tmp
|
*.tmp
|
||||||
|
*.log
|
||||||
*.vspscc
|
*.vspscc
|
||||||
*.vssscc
|
*.vssscc
|
||||||
.builds
|
.builds
|
||||||
@ -47,6 +48,7 @@ ipch/
|
|||||||
# Visual Studio profiler
|
# Visual Studio profiler
|
||||||
*.psess
|
*.psess
|
||||||
*.vsp
|
*.vsp
|
||||||
|
*.vspx
|
||||||
|
|
||||||
# Guidance Automation Toolkit
|
# Guidance Automation Toolkit
|
||||||
*.gpState
|
*.gpState
|
||||||
|
Loading…
Reference in New Issue
Block a user