Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 28 Apr 2010 14:34:42 +0000 (16:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 28 Apr 2010 14:34:42 +0000 (16:34 +0200)
commit43e0568c36b3b7bc14a1f037fc34aed9884cc9fd
treebdba5393a7e422b430c43e7dc86467b9ad331d92
parent1b346a7a227555e4c9a3f192486948d88282cacc
parente2998cd147cabc82595582613ab791ed457ba60c
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir