]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into samual/change_default_balance
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Mar 2011 06:16:50 +0000 (07:16 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Mar 2011 06:16:50 +0000 (07:16 +0100)
commitf393e0ca9834ac021e5dcae033d2f7c13e9cb698
tree69ad5a8c4845dfaeadcda4b2b90fad3b4b74c006
parent612efe644096248beb6e6a08809d9f74d31e81e4
parentc63c0abd3e9789e6ae67b71d03da96ce7738ec61
Merge branch 'master' into samual/change_default_balance
effectinfo.txt
qcsrc/server/w_crylink.qc