Merge branch 'master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:03:50 +0000 (15:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:03:50 +0000 (15:03 +0200)
commit21e86378d16a6d3902de932d8e2ea106df067e72
treea78b3c179d58086795a9931e158e15bbfbca7ce4
parent1ea555a9d408babd4de4ecca329779ceba48396a
parentedecd2d4a836364301c9e35fd330c6ee54eb683a
Merge branch 'master' into cbrutail/shaders_fx_xonotic2