Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 22:46:35 +0000 (00:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 22:46:35 +0000 (00:46 +0200)
commit3c3d7d44f47a050c65fbfe990c0042c5d85159e1
treebb210cab31aa4ee8fdf9ffb0477b207a61a4c797
parenta7057abe85405a114ef491f30c7334ae8c175463
parent952b293de9441c34a0c1f0d9639af521094a8832
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir