Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:41:25 +0000 (21:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:41:25 +0000 (21:41 +0100)
commit3024309e2c0576552bfb2da02ba513662c997768
tree713cf435a3ba697458d46962937e548b858a0d94
parent35d43c7120036e9a3a3601af74266bc4401511a6
parent303ead3f668736766fe0b5e918076653d07844b0
Merge branch 'master' of nl.git.xonotic.org/xonotic/xonotic-data.pk3dir