]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e1a38b 4701512)
Merge branch 'master' into Cloudwalk/Host_Init-overhaul
authorCloudwalk <cloudwalk009@gmail.com>
Wed, 19 Aug 2020 14:24:17 +0000 (10:24 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Wed, 19 Aug 2020 14:24:17 +0000 (10:24 -0400)
1  2 
gl_rmain.c patch | diff1 | diff2 | blob | history

diff --cc gl_rmain.c
Simple merge