Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 19 Nov 2010 12:49:26 +0000 (13:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 19 Nov 2010 12:49:26 +0000 (13:49 +0100)
commit792b0f964cf79db3be162a6b86c77e28a1096aeb
treeef39febca33f7c8f2529f17270c91fe8cb9ae082
parent9e1082c1fafc4b1c84a0b667a96d3d4d44941ca0
parent5dfb3765fc7d66c1bce155195af2448dfb5b213c
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic