Merge branch 'xonotic-maps.pk3dir/itsme/vorix' of git://git.xonotic.org/xonotic/oldst...
authorItsMe <itsme.xonotic@ymail.com>
Thu, 20 Jun 2013 07:37:25 +0000 (09:37 +0200)
committerItsMe <itsme.xonotic@ymail.com>
Thu, 20 Jun 2013 07:37:25 +0000 (09:37 +0200)
commit64dfca1403579e33df5d1b3c31f7b6c1d2395f83
tree8a012ac9ca31ec5bce76392f5cca972cf0f3db79
parent5345a903c510505cb1c34cc05dfefce78ea87e6b
parent6ba4eb88c07ff16e378adf8faa9c46adccd4effc
Merge branch 'xonotic-maps.pk3dir/itsme/vorix' of git://git.xonotic.org/xonotic/oldstuff into itsme/vorix