]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8cb32a5 931fda5)
Resolved .gitignore conflict
authorAshley 'LadyHavoc' Hale <darkplacesengine@gmail.com>
Mon, 2 May 2022 07:09:15 +0000 (00:09 -0700)
committerAshley 'LadyHavoc' Hale <darkplacesengine@gmail.com>
Mon, 2 May 2022 07:09:15 +0000 (00:09 -0700)
1  2 
.gitignore patch | diff1 | diff2 | blob | history

diff --combined .gitignore
index a6084b0d49f94ad453667bb03e41c8e0cd6afdbe,7d90b57aaf776f5372a2d4f14dea6e33050f771e..5ba9ca0f22b30415bea8d957208fbf017f9c81c6
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -24,7 -24,6 +24,10 @@@ Makefile.wi
  .ccls-cache
  *.gch
  /.vs
+ /build
+ /.cache
+ *.kdev4
 +*.vcxproj.user
 +*.pdb
 +*.lib
 +*.exp