andreas/sourcearena
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Andreas 2020-01-25 20:46:19 +01:00
commit f82a446c00
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -19,7 +19,12 @@ ipch
*.idb *.idb
*.vcxproj *.vcxproj
*.sln *.sln
*.lib
# Visual studio config dirs
.vs/* .vs/*
mp/src/.vs/*
sp/src/.vs/*
# OSX/Linux build products # OSX/Linux build products
*.mak *.mak