Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 25 Nov 2010 20:29:25 +0000 (21:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 25 Nov 2010 20:29:25 +0000 (21:29 +0100)
commitd18650a33685341eaba7d5aa4ede7c22e4e47277
treeaa95f752922ec07425138252b36995eaf4d3475a
parent8b53c74a2fe167998144805233497a9d4afdc197
parent8fc5fd2edb32c1d77dca09743fc85d27cbf0a244
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic