]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caee1a7 245c188)
Merge branch 'master' into Cloudwalk/json
authorCloudwalk <cloudwalk009@gmail.com>
Mon, 10 May 2021 15:43:12 +0000 (11:43 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Mon, 10 May 2021 15:43:12 +0000 (11:43 -0400)
1  2 
darkplaces-sdl2-vs2019.vcxproj patch | diff1 | diff2 | blob | history

diff --cc darkplaces-sdl2-vs2019.vcxproj
Simple merge