Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Mon, 19 Dec 2011 11:59:33 +0000 (12:59 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 19 Dec 2011 11:59:33 +0000 (12:59 +0100)
commit12ffb9798ae456940accc88fa00d0f29beaa8413
treea516d7b522271b19c764c86111d2be03ae2cc1b9
parenta378ab28a17b610e364fded21bac1248ced46ea2
parentd66277a0c790cec58e9678bf4e3a784b83f2d443
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg