]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 23 May 2011 15:44:42 +0000 (17:44 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 23 May 2011 15:44:42 +0000 (17:44 +0200)
commit46ce95f99de78e2ebddf0f87e1471167fa0de6fd
treefe7ce7d8db926be5718d6e099672f018370e2b1c
parent623ce28202dc2d429695d7ba496460b802e58180
parent0bb7e6a5835abbc9c1b33d3c824208bea656ba7e
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg