]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ca_ft_fixes
authorterencehill <piuntn@gmail.com>
Tue, 18 Jun 2013 15:33:00 +0000 (17:33 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 18 Jun 2013 15:33:00 +0000 (17:33 +0200)
commit53c0fad35f703c744ffe14a73bf50f96094272c6
tree634d9e4e51b9195f0c733f637f1c4948a0ab5740
parente9b8b02ec887ead824e33c0c6ac55301bb6aa6dc
parentd956593da422ba1a23a26df20f87fe827593938c
Merge branch 'master' into terencehill/ca_ft_fixes
gamemodes.cfg