]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 22 Aug 2011 19:57:43 +0000 (21:57 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 22 Aug 2011 19:57:43 +0000 (21:57 +0200)
commit28c8560a7a9c20eb72eb68ecf4ef232005a672f8
tree7a8a5f267836b5320c89a2624a573c600d0d55c9
parentf29dc76f4cb0652206bfefa6f22d3a1a4b77bdcd
parent7a87379d943a634026716e20d3abace65ed53015
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
server/server.cfg