]> git.xonotic.org Git - xonotic/darkplaces.git/commit
Merge branch 'master' into Cloudwalk/json
authorCloudwalk <cloudwalk009@gmail.com>
Tue, 25 May 2021 23:29:49 +0000 (19:29 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Tue, 25 May 2021 23:29:49 +0000 (19:29 -0400)
commit3756e256abc8f600eed211ff0f1319d482818ba7
tree4f9852879c75df1532ddd4034eb03669e62587bb
parentf6bad68c8184ca5ef410c4dfb20ed50277e1ef13
parentbbb80fb5e4edbd1a226bdc0e15d6f45efa11c67b
Merge branch 'master' into Cloudwalk/json
darkplaces-sdl2-vs2017.vcxproj
darkplaces-sdl2-vs2019.vcxproj
host.c