]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into samual/menu_updates
authorRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jan 2012 19:01:19 +0000 (20:01 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jan 2012 19:01:19 +0000 (20:01 +0100)
commit63b5a495ebed72365993b31123d0fe4dca94737a
treebbe9f44693ccd8e818013417fd8cceb88a478fcd
parent00a3a898e303495cf2839b75916f22792982d1b9
parentaa0a67f7bfd28a6ff956fff26e38185d22f609a8
Merge branch 'master' into samual/menu_updates
defaultXonotic.cfg