]> 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: ddc5e28 26df511)
Merge branch 'cbrutail/effects-beams' into cbrutail/map-fanatic
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 22 Jan 2011 20:16:30 +0000 (21:16 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 22 Jan 2011 20:16:30 +0000 (21:16 +0100)

Trivial merge