]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'terencehill/screenshot_viewer' into terencehill/player_model_zoom
authorterencehill <piuntn@gmail.com>
Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)
commit9005c82751201ad513adaa4a9cdf45767880d4c0
treefd0043096989cefaf68f81de2172fc56f377ca70
parent0b192b1938684fd3d2a4fea24747aa3be0cb4369
parentb47667e4835b470b10ac1875c5dddb766ddd16a3
Merge branch 'terencehill/screenshot_viewer' into terencehill/player_model_zoom
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c