]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commitbc7463db72f13bd43eb2afed401eec334a4ed34a
tree8aeda5c4841b637f0e58d4524249f4ff2ce67b49
parentddc5e281f4196660e11463230ca314230c45e5e1
parent26df51116170658f652cc17340287d5e62de6cc9
Merge branch 'cbrutail/effects-beams' into cbrutail/map-fanatic