Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 19:48:23 +0000 (20:48 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 19:48:23 +0000 (20:48 +0100)
commit39c5a2ddb560b76d6134ee27da5096eb784eac25
tree093812d5b6d04a9d98957346795669ed010060b8
parent2b9d0f33bcb879acccf00d66242e8c8c5f8d868f
parent57c658ba50dd3d752e25137be6d0a49b5daf1c9c
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg