Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)
1  2 
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/menu/classes.c
qcsrc/menu/skin-customizables.inc

Simple merge
Simple merge
Simple merge
Simple merge