]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/func_train_beizer_curve
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 11 Jun 2012 12:18:14 +0000 (15:18 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 11 Jun 2012 12:18:14 +0000 (15:18 +0300)
commit1e368ede69af478891b491c8e0564666910d9012
tree2f1f83bca88258514a4bbc84f639580eae76de7b
parenta741da05a61305170010a4db08bcd254f57c01d8
parent4989f9f6b084063ba3ad9565a9b3ade9b1033728
Merge branch 'master' into mirceakitsune/func_train_beizer_curve