]> 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: f84b117 244d589)
Merge branch 'theshadow/reflection' of git://git.xonotic.org/xonotic/xonotic-maps...
authorPearce Michal <yodaalmighty2000@gmail.com>
Thu, 31 Mar 2011 03:57:46 +0000 (23:57 -0400)
committerPearce Michal <yodaalmighty2000@gmail.com>
Thu, 31 Mar 2011 03:57:46 +0000 (23:57 -0400)

Trivial merge