]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bfa683 75335b2)
Merge branch 'master' into Cloudwalk/32bitprogs
authorCloudwalk <cloudwalk009@gmail.com>
Wed, 12 Aug 2020 16:21:24 +0000 (12:21 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Wed, 12 Aug 2020 16:21:24 +0000 (12:21 -0400)
1  2 
sv_ccmds.c patch | diff1 | diff2 | blob | history

diff --cc sv_ccmds.c
Simple merge