]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Fix some post-merge issues
authorterencehill <piuntn@gmail.com>
Sat, 4 Feb 2012 19:10:06 +0000 (20:10 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 4 Feb 2012 19:10:06 +0000 (20:10 +0100)
commitadd2ac34a0dca6159ba8a6bcf6805db61e445268
treebff2ea6b3e968f4e8a22d030cb78df7c1096c3ea
parent49e47ad10d83c939eca33d2c5f542d01c7da2b3e
Fix some post-merge issues
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c