]> de.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: 8c40def 30c1f5c)
Merge branch 'master' into mirceakitsune/red_planet
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 30 Jan 2011 21:25:24 +0000 (23:25 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 30 Jan 2011 21:25:24 +0000 (23:25 +0200)

Trivial merge