]> git.xonotic.org Git - xonotic/darkplaces.git/commit
Merge branch 'master' into bones_was_here/net_s7 bones_was_here/net_s7
authorCloudwalk <cloudwalk009@gmail.com>
Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)
commitc5ac1f6532e3da1344de5a8405e90538fe0a4289
tree1da7ae1eafc4963dffc27b640e1cdf3a74099773
parent1d8406cbddb33b72497bf8cbc71c6607204ce8f9
parent8d2492ac4364e1a51e7f84c6ea1c34429f060939
Merge branch 'master' into bones_was_here/net_s7
server.h
sv_main.c