Merge branch 'cbrutail/decals-xonotic' into tzork/nexballarena
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 3 Nov 2010 18:38:21 +0000 (19:38 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 3 Nov 2010 18:38:21 +0000 (19:38 +0100)

Trivial merge