]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/lab610
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 8 Jun 2011 16:02:09 +0000 (19:02 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 8 Jun 2011 16:02:09 +0000 (19:02 +0300)

Trivial merge