Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 23 Dec 2011 22:37:29 +0000 (23:37 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 23 Dec 2011 22:37:29 +0000 (23:37 +0100)
commit6247d490047631d05b4e1eba9590fcc1a8cce5aa
tree9465379349f334799c241e518c9af1364dbc7e2c
parented3c425853ea07edf78e249a16313bdbe01dc6ac
parentaeceab8f2e2a8e14ee110fda0d400daa3536c802
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg