Merge branch 'master' into cbrutail/decals-xonotic
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 08:06:42 +0000 (09:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 08:06:42 +0000 (09:06 +0100)
commit5157a76853b3f2cad0b01d24709fd164ce46bd4a
tree449fd02bf337b9cfba02e2b54b7ebc11fed8c002
parenta4205507a6ff83eab317284295f41d00e09af541
parent8c9698f3b8054c506c4e347b7d95c9899b95ae56
Merge branch 'master' into cbrutail/decals-xonotic