Merge r55012 adding Wine3D control panel as per Amine's request.

svn path=/branches/ros-branch-0_3_14/; revision=55363

diff --cc dll/cpl/CMakeLists.txt
Simple merge

diff --cc dll/cpl/cpl.rbuild
Simple merge

diff --cc dll/cpl/wined3dcfg/CMakeLists.txt
index 0000000,3a942cc..3a942cc
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/CMakeLists.txt
+++ b/dll/cpl/wined3dcfg/CMakeLists.txt

diff --cc dll/cpl/wined3dcfg/general.c
index 0000000,6314bf2..6314bf2
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/general.c
+++ b/dll/cpl/wined3dcfg/general.c

diff --cc dll/cpl/wined3dcfg/lang/en-US.rc
index 0000000,704df8b..704df8b
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/lang/en-US.rc
+++ b/dll/cpl/wined3dcfg/lang/en-US.rc

diff --cc dll/cpl/wined3dcfg/resource.h
index 0000000,c28e972..c28e972
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/resource.h
+++ b/dll/cpl/wined3dcfg/resource.h

diff --cc dll/cpl/wined3dcfg/resources/wined3dcfg.ico
index 0000000,75c14de..75c14de
mode 000000,100644..100644
Binary files differ

diff --cc dll/cpl/wined3dcfg/rsrc.rc
index 0000000,f110487..f110487
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/rsrc.rc
+++ b/dll/cpl/wined3dcfg/rsrc.rc

diff --cc dll/cpl/wined3dcfg/wined3dcfg.c
index 0000000,98b1eaf..98b1eaf
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/wined3dcfg.c
+++ b/dll/cpl/wined3dcfg/wined3dcfg.c

diff --cc dll/cpl/wined3dcfg/wined3dcfg.h
index 0000000,480c07f..480c07f
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/wined3dcfg.h
+++ b/dll/cpl/wined3dcfg/wined3dcfg.h

diff --cc dll/cpl/wined3dcfg/wined3dcfg.rbuild
index 0000000,5ffd603..5ffd603
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/wined3dcfg.rbuild
+++ b/dll/cpl/wined3dcfg/wined3dcfg.rbuild

diff --cc dll/cpl/wined3dcfg/wined3dcfg.rc
index 0000000,5fafaec..5fafaec
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc
+++ b/dll/cpl/wined3dcfg/wined3dcfg.rc

diff --cc dll/cpl/wined3dcfg/wined3dcfg.spec
index 0000000,9389883..9389883
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/cpl/wined3dcfg/wined3dcfg.spec
+++ b/dll/cpl/wined3dcfg/wined3dcfg.spec