Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 28 Oct 2010 13:12:39 +0000 (15:12 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 28 Oct 2010 13:12:39 +0000 (15:12 +0200)
commitfc7c59755079219daf58463ba14c5d7dcdb51da3
treec503f2b952c63ddaf36b745ccf7afb584ec44dae
parent7e77f3aa77a86920ad7fb68e00bdb480b9d4419e
parent596f6dab362294c354b5c39f95d0c8452cf7c835
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir