]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 16:37:28 +0000 (18:37 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 16:37:28 +0000 (18:37 +0200)
commit5c1853300daf8fd4855f5a693c86a1c05c79633c
treeaf34f2751498b90564776fc3bc0e65af91de3372
parente5cec7ef408853cad605faadb3a1ee0a4b5a5a9d
parentbba4978faed0ce7058b1beaf827fd0d6af3fe0c8
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
qcsrc/server/cl_client.qc
qcsrc/server/cl_weaponsystem.qc