Merge remote branch 'origin/master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:15:59 +0000 (12:15 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:15:59 +0000 (12:15 +0200)
commitaebef1b6e48e238ced7d11da1d3671e1288d11e6
treea98888cfbd7d94c6a18d68e94889661d8216ae30
parent09a514ba8fc96fdeb6ab60accf5a4d3480ef6c5b
parent53ec6ce82588fa3afab1f6ce8dd70b8da95e7c32
Merge remote branch 'origin/master' into cbrutail/shaders_fx_xonotic2