]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 00:13:11 +0000 (02:13 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 00:13:11 +0000 (02:13 +0200)
commit21403f1e9510d608415d14bf4348880b9ff42204
tree90a54d7c8f7c0991c20295e7af04238b6bf8e0a8
parent06251c1fe4c65a61a6d279368f4c9ee9d2dd6366
parent05547ce591f34ad8661f15432a07223a581e59db
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/common/util.qh
qcsrc/server/g_damage.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc