]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e77b50 fe7a27c)
Merge branch 'master' into Cloudwalk/cvar_overhaul
authorCloudwalk <cloudwalk009@gmail.com>
Fri, 30 Jul 2021 18:13:50 +0000 (14:13 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Fri, 30 Jul 2021 18:13:50 +0000 (14:13 -0400)
1  2 
prvm_cmds.c patch | diff1 | diff2 | blob | history
prvm_edict.c patch | diff1 | diff2 | blob | history

diff --cc prvm_cmds.c
Simple merge
diff --cc prvm_edict.c
Simple merge