]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 16 Jan 2012 19:54:53 +0000 (21:54 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 16 Jan 2012 19:54:53 +0000 (21:54 +0200)
commit48a9eb74e54b8e703797522a2591c65d19596915
treefc0581e743b2324ab730639a236a3e4df09d2474
parente2cdd292127becabc2bbc805d83695713c553781
parentf8c8bc2cd94c416143ddb80e16cd9e49d4598505
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/common/util.qc
qcsrc/common/util.qh