Merge remote-tracking branch 'arsenm/patch-1'
Conflicts: C.gitignore
This commit is contained in:
commit
fae236e74a
@ -3,13 +3,15 @@
|
|||||||
|
|
||||||
# Libraries
|
# Libraries
|
||||||
*.lib
|
*.lib
|
||||||
|
*.a
|
||||||
|
|
||||||
# Shared objects (inc. Windows DLLs)
|
# Shared objects (inc. Windows DLLs)
|
||||||
*.dll
|
*.dll
|
||||||
*.so
|
*.so
|
||||||
|
*.so.*
|
||||||
*.dylib
|
*.dylib
|
||||||
|
|
||||||
# Executables
|
# Executables
|
||||||
*.exe
|
*.exe
|
||||||
*.out
|
*.out
|
||||||
|
*.app
|
||||||
|
Loading…
Reference in New Issue
Block a user