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)
commit7c2496212d72e4a10f62754c35c88ae6a59a9197
tree4d279dad6e1727b6721d41f4c7065eb0d4b74c37
parent8d943c67c4b75b07fc95764bbe4f5aa364b2b049
parenta23887d228871c6fc2a58e3d19063519d54743e8
Merge branch 'cbrutail/decals-xonotic' into tzork/nexballarena