]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' into matthiaskrgr/all_map_pk3
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 11 Sep 2013 17:04:10 +0000 (19:04 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 11 Sep 2013 17:04:10 +0000 (19:04 +0200)
commitd4d35ed2a95ae52c8c1478df35aa13896554e4e3
treeb547cf3a6e3ea32360b848010b02ca32e0c772bd
parent029c6517c3fd417e43d9a89caf5a43ad5be83f0e
parentaf69a7de874832eca1be0c176c3f57d45d8c4e80
Merge branch 'master' into matthiaskrgr/all_map_pk3

Conflicts:
misc/tools/all/xonotic.subr
misc/tools/all/xonotic.subr