Merge remote branch 'origin/cbrutail/decals-xonotic'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 07:34:57 +0000 (08:34 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 07:34:57 +0000 (08:34 +0100)
commit8e2686150eb9ccd6e33ec7e71d1108902c04c1d2
tree8b16e2a14d404a43241c70f19a816ba5c15ada6d
parent2acf9d86ba3e128f0f650c13d55083d234cd0377
parent8c128c1410c4ac8ee6b59450dbc54616638f70e8
Merge remote branch 'origin/cbrutail/decals-xonotic'