Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Wed, 2 Feb 2011 23:22:55 +0000 (00:22 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 2 Feb 2011 23:22:55 +0000 (00:22 +0100)
commit8d484c93801393279f8956b7d8806d78b50f6de9
tree817b70f242d484b6edb8fe27d732e39b14e834b2
parentce9eb2ceaf174c20e4cb99358a6f3ce96b8dc324
parent1a9a20d9faf56d6294f6aa169cef9e7f9a8be562
Merge branch 'master' into terencehill/screenshot_viewer

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