]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/func_train_beizer_curve
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 May 2012 00:30:25 +0000 (03:30 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 May 2012 00:30:25 +0000 (03:30 +0300)

Trivial merge