Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:42:02 +0000 (09:42 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:42:02 +0000 (09:42 +0100)
commit6dac08025d0ee0e26007b045167b6484598cf429
tree08f03e193517ebf3ca4e1e61be738bbb39f92dc8
parentf79b965d51821cdcef5065f2b3b6b545c6c24382
parent4942746ed9345dac5e0fbaa810d1189c747ea9e2
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg