]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 10 Feb 2013 01:47:24 +0000 (12:47 +1100)
committerMario <mario.mario@y7mail.com>
Sun, 10 Feb 2013 01:47:24 +0000 (12:47 +1100)
commit5d4356eea933cc687e5958e9632695f0e2890159
tree1fbbc4111ab127222da329e8861de626e5546c72
parentf56909500a5fc5b0719870d23b82cc3f2904f3c1
parent48388e38c1377c33f08feed8e76c0a2c9212a20c
Merge branch 'master' into mario/monsters
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/progs.src
qcsrc/server/w_electro.qc