]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 13 Dec 2011 07:42:50 +0000 (02:42 -0500)
committerSamual <samual@xonotic.org>
Tue, 13 Dec 2011 07:42:50 +0000 (02:42 -0500)
commitb0f359e16b0690d457fdc6fb7cb4f2d8d51da7bc
tree104a54edd800058a09578e8e828311cd4fb4e830
parent9199a1244833c6e398923683d0bf4648567f6533
parent62973d3c6c2c51edc3711a80190014483160da49
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
qcsrc/server/clientcommands.qc
qcsrc/server/clientcommands.qc