Merge branch 'master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:01:39 +0000 (15:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:01:39 +0000 (15:01 +0200)
commit1ea555a9d408babd4de4ecca329779ceba48396a
tree836d57efbd039b2acde14eda1ed3d022847ed8d7
parent594f0b77f88f05a5a46760af07693babc1802789
parent668b692d55740069fb8e391356a9506990e9da2d
Merge branch 'master' into cbrutail/shaders_fx_xonotic2