projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f1e8b9 4dc6a80)
Merge branch 'master' into mirceakitsune/lab610
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 19 Aug 2011 12:42:35 +0000 (15:42 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 19 Aug 2011 12:42:35 +0000 (15:42 +0300)

Trivial merge