Merge branch 'origin/master' (early part) into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:01:02 +0000 (12:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:01:02 +0000 (12:01 +0200)
commit09a514ba8fc96fdeb6ab60accf5a4d3480ef6c5b
tree71560e93237dc0e8af77f213309a6861ae1163e0
parenteddcbc5b97dcefeef8cb4fe9e66364a1a78fc1a1
parentc9ade67954f7789b5a88589947850ee0f416abd6
Merge branch 'origin/master' (early part) into cbrutail/shaders_fx_xonotic2