Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 08:29:20 +0000 (09:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 08:29:20 +0000 (09:29 +0100)
commitb3531989fe085982b9fa1b4c8e3a35947936e441
tree0eafc97e091cf9e1085c93b303b7a07cb354983a
parent5282c14c1d05ab55753a3f694398862fa299fc9b
parentf4039403312d9b1961ae367c32b7f0c3a469f3af
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir