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)
commit0d3f9b43325161631e21e0daa8dfdd943975fe74
tree160d3d6cf06be82dbeb36af3024876c74d5024a6
parentc27a13a9232a163fba20609d9648670378641c91
parente6bb286fd1beb18b27fd5c73da319977b4b7b78c
Merge branch 'master' into terencehill/screenshot_viewer
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/menu/classes.c
qcsrc/menu/skin-customizables.inc