]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 Jan 2012 12:47:29 +0000 (14:47 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 Jan 2012 12:47:29 +0000 (14:47 +0200)
commitc4b09062e3dc4b40cd17bc7658e8a21043abb66b
tree145d78cb6683d0935117184dee47e7533d158c6d
parent53786a209467e5da2df529454e6cb70dc14e1fd6
parentaa6943d5edcf98b434db249de720c76b1a92ff8d
Merge branch 'master' into mirceakitsune/damage_effects
qcsrc/client/damage.qc
qcsrc/server/g_damage.qc