]> 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: 6b92071 24c6fe5)
Merge remote-tracking branch 'origin/master' into theshadow/maze
authorPearce 'theShadow' Michal <pearcem.dx@gmail.com>
Mon, 30 Jan 2012 17:08:19 +0000 (12:08 -0500)
committerPearce 'theShadow' Michal <pearcem.dx@gmail.com>
Mon, 30 Jan 2012 17:08:19 +0000 (12:08 -0500)

Trivial merge