]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 15 May 2013 04:26:52 +0000 (14:26 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 15 May 2013 04:26:52 +0000 (14:26 +1000)
commite61cc9b40055dc8bc46d0c250e98164846d79166
tree247c2a9af471d14646da968cec9b16641c914152
parenta233bfa48d813c2b7bc4c054abdcd422f2f19f4f
parent5e89ee53a70a9299a8b65c47ccdd6bb268c06ac7
Merge branch 'master' into Mario/monsters
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/mutators/base.qh
qcsrc/server/t_items.qc
qcsrc/server/w_electro.qc