]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/player_model_zoom
authorterencehill <piuntn@gmail.com>
Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)
commita1eb8dcb97c5d158869917669804f71758e0420f
tree0498b1afee3938081db388f2464d5f03c0241ccb
parentde55a772dae25acb3a8c9f2e102331fd99bb0d8d
parent56ed5bb264f69cc4a9020460423183757998205b
Merge branch 'master' into terencehill/player_model_zoom
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c