]> 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: 64c15a1 6998fb7)
Merge branch 'cbrutail/model_walker-static' into cbrutail/map-fanatic
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 22 Jan 2011 15:35:10 +0000 (16:35 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 22 Jan 2011 15:35:10 +0000 (16:35 +0100)

Trivial merge