Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 12 Nov 2010 21:44:10 +0000 (22:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 12 Nov 2010 21:44:10 +0000 (22:44 +0100)
commitb249788aac5c137dea22e6330821c1685545ad79
tree392e4aba31d0b752fea751b9be33f6501615fe34
parentf2c6c1078e302a8899360223ce2ff2876b977bfa
parent416069df3ae18d509c19402dc2f4b830d5a5ed09
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir