]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Sun, 11 Dec 2011 18:44:10 +0000 (19:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 11 Dec 2011 18:44:10 +0000 (19:44 +0100)
commit1063af9f08612927b63f9835f33d09b3b45e7063
tree9092fe31ad86ef5240beac87b38cf23ba491a18d
parentb96bb305f056b6bc42e0691657ac9414ea5e5691
parentfdc6550fe8559e3a4ce5bc5769b1d3d0747207c9
Merge branch 'master' into divVerent/csqcmodel
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh