Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 05:00:34 +0000 (07:00 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 05:00:34 +0000 (07:00 +0200)
commit31732fe76f43c42412d80a6543ebd6939cd5b68f
tree89a520702d20614a5ea04d136e3cd2f7edf45155
parent634c81128e059e883e9d9ee198937fd055639f6c
parentf3c0dffcbf2d8bf4cb98fd0d0010d8988f6ea002
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir