Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Sat, 4 Feb 2012 19:04:42 +0000 (20:04 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 4 Feb 2012 19:04:42 +0000 (20:04 +0100)
commit49e47ad10d83c939eca33d2c5f542d01c7da2b3e
treecbeb4ed2871e04e2d069c8bb1034bfde8979215d
parentc124ca87a28c2cbf69835e8ca2549baf9b872609
parenta0a801380e31ad270768fef20e078a599262df5a
Merge branch 'master' into terencehill/screenshot_viewer

Conflicts:
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/menu/item/image.c
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/xonotic/mainwindow.c
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/menu/classes.c
qcsrc/menu/item/image.c
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/xonotic/mainwindow.c