]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:31:21 +0000 (20:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:31:21 +0000 (20:31 +0200)
commit4cf67f3644408e5ac791692650b6b9b0660884cf
tree65e7e18adedb9184000993899e0a65e896a6df0c
parent7d4dbe9f24c335473a85ea592949734659d8dc3d
parent196c64ee787f27394d191b68b7a46e8b071e9a7d
Merge branch 'master' into divVerent/fruitbalance
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc