]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 12 Apr 2011 17:18:40 +0000 (20:18 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 12 Apr 2011 17:18:40 +0000 (20:18 +0300)
commit07aca341b89653d4d8979c34f099d6a04d23dd10
treeede9feb228b3baa88c9474447579252b3a1039f6
parentc731a33a3c2e08a9c7db32fa5e1e31fab7b24ab8
parentf7f36e7cb72f1c9709219b1fdc52e3f5dc3748d3
Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
balanceSamual.cfg
defaultXonotic.cfg
qcsrc/client/View.qc