]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commit8ae192e71809ef5c04dfcd30395b95da9913b9ab
tree27acd2279ed4ca01192b5d22cc32e92fe3b7e8d5
parent00ce31d181bf10874811103135cb0114df0a1633
parent8b6b56534e66cde05de4be679ed1e902f9c48610
Merge remote-tracking branch 'origin/master' into theshadow/reflection