]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 31 Dec 2011 07:28:45 +0000 (02:28 -0500)
committerSamual <samual@xonotic.org>
Sat, 31 Dec 2011 07:28:45 +0000 (02:28 -0500)
commitb40fec44bad9207fb7c4bb6aa7fd22dadf3e03cc
treedad6799586fc6966e0ddd4cf78e888144ea77546
parent80fbcefaf5450e3bdb0dcb26c170ed5dc4da3aee
parent8edee1521024b69aacac0fcb74be97e5a0d1da39
Merge remote branch 'origin/master' into samual/updatecommands
qcsrc/dpdefs/menudefs.qc
qcsrc/server/cl_player.qc