]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Sat, 22 Sep 2012 08:53:05 +0000 (10:53 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 22 Sep 2012 08:53:05 +0000 (10:53 +0200)
commitf66262ee900f3db4c68d5632fe1bc598cd371edf
treec9549c2bce8bc49f262549ba65c2c8aad52b210d
parent59391d268c44809ec9f9e4eeef8306988c2af0bc
parent30f020f96d715a6dec3f850cabe9476f03300d20
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir