]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68c939f bd4eebf)
Merge branch 'master' into mirceakitsune/station-x mirceakitsune/station-x
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 11 Sep 2013 20:58:18 +0000 (23:58 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 11 Sep 2013 20:58:18 +0000 (23:58 +0300)

Trivial merge