]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 14 Oct 2011 19:07:36 +0000 (21:07 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 14 Oct 2011 19:07:36 +0000 (21:07 +0200)
commitf45f7d0938eefdfcf0825a7d79275335a07a4ed6
tree8e0949b571119308134b7f66a4bb64a7bcda8a54
parentb293a5482bdf7b31998057e5e8b14ed597b614d6
parent58a2e777de55cd78555e6b4526b5e84e9430fec8
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg