Merge branch 'master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:50 +0000 (13:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:50 +0000 (13:10 +0200)
commit594f0b77f88f05a5a46760af07693babc1802789
treee3942daad4d2eeca7bb471a5a2d5f980b0d7740a
parentaebef1b6e48e238ced7d11da1d3671e1288d11e6
parent4768c3710ba6063ef1476bb200c1275d3c9c6b08
Merge branch 'master' into cbrutail/shaders_fx_xonotic2