]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Fri, 30 Mar 2012 18:35:45 +0000 (14:35 -0400)
committerSamual <samual@xonotic.org>
Fri, 30 Mar 2012 18:35:45 +0000 (14:35 -0400)
commit52e4da5b8f80517a35fe87cff0fea463c9d66027
tree492f8fd0a60d8c606ea6c414f07010825d1cafd2
parent09d9b553292a1c29e54029a596fb4d881411aef5
parent19e342b0463a6faf992ac4ed7fb19a0b9e65da0b
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/cl_player.qc