]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Merge branch 'master' into Cloudwalk/protocol_redesign
authorCloudwalk <cloudwalk009@gmail.com>
Tue, 6 Oct 2020 14:10:57 +0000 (10:10 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Tue, 6 Oct 2020 14:10:57 +0000 (10:10 -0400)
1  2 
clvm_cmds.c
mvm_cmds.c
server.h
svvm_cmds.c

diff --cc clvm_cmds.c
Simple merge
diff --cc mvm_cmds.c
Simple merge
diff --cc server.h
Simple merge
diff --cc svvm_cmds.c
Simple merge