]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c83eb0 e40b8b5)
Merge branch 'master' into mirceakitsune/lab610
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 5 Jun 2011 15:10:33 +0000 (18:10 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 5 Jun 2011 15:10:33 +0000 (18:10 +0300)

Trivial merge