]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 7 Apr 2011 21:41:25 +0000 (00:41 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 7 Apr 2011 21:41:25 +0000 (00:41 +0300)
commit73f33a997a4499bdc04d1f8bd244d02856adfcbd
tree4be55d0e4724c2a74c97b3d77489f34043499aad
parent84b6651f9766fecf9fac970fb6856ee06452e76d
parent0df96e4d3a9f2e0918451866a70799d8ad18cfd3
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/server/cl_player.qc