Merge branch 'master' into terencehill/screenshot_viewer

author terencehill <piuntn@gmail.com>

Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)

committer terencehill <piuntn@gmail.com>

Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)
author terencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)
committer terencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)
diff --cc gfx/menu/luminos/skinvalues.txt
Simple merge
diff --cc gfx/menu/wickedx/skinvalues.txt

index 2757c1fc21a657c47a13188ff2a05f4631f893f2,15605128588e79c4e3c73c4f647a3e518837ea50..be0ee5b0e2f2438aa7ff91f0327fce77640caa3b

mode 100644,100755..100644
--- 1/gfx/menu/wickedx/skinvalues.txt
--- 2/gfx/menu/wickedx/skinvalues.txt
+++ b/gfx/menu/wickedx/skinvalues.txt
diff --cc gfx/menu/xaw/skinvalues.txt
Simple merge
diff --cc qcsrc/menu/classes.c
Simple merge
diff --cc qcsrc/menu/skin-customizables.inc
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)
committer	terencehill <piuntn@gmail.com>
	Tue, 6 Aug 2013 22:19:40 +0000 (00:19 +0200)
		1	2
gfx/menu/luminos/skinvalues.txt	patch \|	diff1 \|	diff2 \|	blob \| history
gfx/menu/wickedx/skinvalues.txt	patch \|	diff1 \|	diff2 \|	blob \| history
gfx/menu/xaw/skinvalues.txt	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/skin-customizables.inc	patch \|	diff1 \|	diff2 \|	blob \| history