Merge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 20:25:55 +0000 (16:25 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 20:25:55 +0000 (16:25 -0400)
commit6b188d663fd973615bd71b58cfd2d7b1b2df0ca9
tree407078ecacdf787b304c285aad8945df8309f53c
parent0102957b7db3d606b11f6f1064727137614326d2
parent565a9526738602d1e62040b4406dc9412aaeb9ef
Merge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh