]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/connection_msg_fix' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 24 Dec 2015 00:56:28 +0000 (00:56 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 24 Dec 2015 00:56:28 +0000 (00:56 +0000)
connection msg fix

See merge request !269

1  2 
qcsrc/server/teamplay.qc

Simple merge