]> 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: a4c63b1 0835d30)
Merge remote branch 'origin/mirceakitsune/red_planet'
authormand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:02:06 +0000 (20:02 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:02:06 +0000 (20:02 -0300)

Trivial merge