]> 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@alientrap.org>
Fri, 20 Jan 2012 16:17:25 +0000 (17:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Jan 2012 16:17:25 +0000 (17:17 +0100)
commit2ab57b248854a04ac90ab5652f409770a20139c0
tree31d9d60df51795b0d7b0c170b50ee8452494c2ce
parent58eb471d26174f7d18d8ea0777378fb16ce17db2
parent3e3baa2f19b654ab2982198e00ea8b09f885c66d
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg