]> 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: 00ce31d 8b6b565)
Merge remote-tracking branch 'origin/master' into theshadow/reflection
authorPearce 'theShadow' Michal <pearcem.dx@gmail.com>
Thu, 16 Feb 2012 16:13:35 +0000 (11:13 -0500)
committerPearce 'theShadow' Michal <pearcem.dx@gmail.com>
Thu, 16 Feb 2012 16:13:35 +0000 (11:13 -0500)

Trivial merge