* Sync up to trunk HEAD (r62975).

svn path=/branches/shell-experiments/; revision=62976

diff --cc base/applications/games/solitaire/lang/bg-BG.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/ca-ES.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/cs-CZ.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/de-DE.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/el-GR.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/en-US.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/es-ES.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/eu-ES.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/fr-FR.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/he-IL.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/hu-HU.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/id-ID.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/it-IT.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/ja-JP.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/ko-KR.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/lt-LT.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/nl-NL.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/no-NO.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/pl-PL.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/ro-RO.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/ru-RU.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/sk-SK.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/sq-AL.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/sv-SE.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/th-TH.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/tr-TR.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/uk-UA.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/zh-CN.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/zh-TW.rc
Simple merge

diff --cc base/applications/games/solitaire/resource.h
Simple merge

diff --cc base/applications/games/solitaire/solcreate.cpp
Simple merge

diff --cc base/applications/games/solitaire/solgame.cpp
Simple merge

diff --cc base/applications/games/solitaire/solitaire.cpp
Simple merge

diff --cc base/applications/games/solitaire/solitaire.h
Simple merge

diff --cc base/applications/rapps/lang/pl-PL.rc
Simple merge

diff --cc base/applications/rapps/rapps/alreader.txt
Simple merge

diff --cc base/applications/rapps/rapps/ants.txt
Simple merge

diff --cc base/applications/rapps/rapps/bochs.txt
Simple merge

diff --cc base/applications/rapps/rapps/boswars.txt
Simple merge

diff --cc base/applications/rapps/rapps/boundaround.txt
index 0000000,6c50c43..6c50c43
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/boundaround.txt
+++ b/base/applications/rapps/rapps/boundaround.txt

diff --cc base/applications/rapps/rapps/christmasbound.txt
index 0000000,dac37a4..dac37a4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/christmasbound.txt
+++ b/base/applications/rapps/rapps/christmasbound.txt

diff --cc base/applications/rapps/rapps/chromium.txt
Simple merge

diff --cc base/applications/rapps/rapps/codeblocks.txt
index 0000000,a21ed29..a21ed29
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/codeblocks.txt
+++ b/base/applications/rapps/rapps/codeblocks.txt

diff --cc base/applications/rapps/rapps/codeblocks_gcc.txt
index 0000000,8f0f87d..8f0f87d
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt
+++ b/base/applications/rapps/rapps/codeblocks_gcc.txt

diff --cc base/applications/rapps/rapps/codeblocks_gcc_2.txt
index 0000000,20e15bf..20e15bf
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt
+++ b/base/applications/rapps/rapps/codeblocks_gcc_2.txt

diff --cc base/applications/rapps/rapps/devcpp_mingw32.txt
index 0000000,de51e04..de51e04
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt
+++ b/base/applications/rapps/rapps/devcpp_mingw32.txt

diff --cc base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
index 0000000,2761f21..2761f21
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
+++ b/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt

diff --cc base/applications/rapps/rapps/doublecommander.txt
Simple merge

diff --cc base/applications/rapps/rapps/dvdwritenow.txt
Simple merge

diff --cc base/applications/rapps/rapps/fira.txt
Simple merge

diff --cc base/applications/rapps/rapps/firefox.txt
Simple merge

diff --cc base/applications/rapps/rapps/globulation2.txt
Simple merge

diff --cc base/applications/rapps/rapps/hover.txt
Simple merge

diff --cc base/applications/rapps/rapps/hxd.txt
Simple merge

diff --cc base/applications/rapps/rapps/indiftpd.txt
Simple merge

diff --cc base/applications/rapps/rapps/kyodai.txt
Simple merge

diff --cc base/applications/rapps/rapps/lazaruside.txt
Simple merge

diff --cc base/applications/rapps/rapps/libreoffice.txt
Simple merge

diff --cc base/applications/rapps/rapps/mirandaim.txt
Simple merge

diff --cc base/applications/rapps/rapps/mpc.txt
Simple merge

diff --cc base/applications/rapps/rapps/mpxplay.txt
Simple merge

diff --cc base/applications/rapps/rapps/npp.txt
Simple merge

diff --cc base/applications/rapps/rapps/opencodecs.txt
Simple merge

diff --cc base/applications/rapps/rapps/openttd.txt
Simple merge

diff --cc base/applications/rapps/rapps/peazip.txt
index 0000000,52857bd..52857bd
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/peazip.txt
+++ b/base/applications/rapps/rapps/peazip.txt

diff --cc base/applications/rapps/rapps/pengupop.txt
Simple merge

diff --cc base/applications/rapps/rapps/photofiltre.txt
Simple merge

diff --cc base/applications/rapps/rapps/pingus.txt
Simple merge

diff --cc base/applications/rapps/rapps/pspad.txt
Simple merge

diff --cc base/applications/rapps/rapps/ptanks.txt
Simple merge

diff --cc base/applications/rapps/rapps/python.txt
Simple merge

diff --cc base/applications/rapps/rapps/qb64sdl.txt
Simple merge

diff --cc base/applications/rapps/rapps/qmmp.txt
Simple merge

diff --cc base/applications/rapps/rapps/reshack.txt
Simple merge

diff --cc base/applications/rapps/rapps/rocks.txt
Simple merge

diff --cc base/applications/rapps/rapps/scite.txt
Simple merge

diff --cc base/applications/rapps/rapps/seamonkey.txt
Simple merge

diff --cc base/applications/rapps/rapps/smplayer.txt
Simple merge

diff --cc base/applications/rapps/rapps/snoopy.txt
index 0000000,8ae0a8a..8ae0a8a
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/snoopy.txt
+++ b/base/applications/rapps/rapps/snoopy.txt

diff --cc base/applications/rapps/rapps/stamina.txt
Simple merge

diff --cc base/applications/rapps/rapps/summerbound.txt
index 0000000,e17a8d4..e17a8d4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/rapps/rapps/summerbound.txt
+++ b/base/applications/rapps/rapps/summerbound.txt

diff --cc base/applications/rapps/rapps/superdxb.txt
Simple merge

diff --cc base/applications/rapps/rapps/supertux.txt
Simple merge

diff --cc base/applications/rapps/rapps/thunderbird.txt
Simple merge

diff --cc base/applications/rapps/rapps/totalcommander.txt
Simple merge

diff --cc base/applications/rapps/rapps/utorrent.txt
Simple merge

diff --cc base/applications/rapps/rapps/vlc.txt
Simple merge

diff --cc base/applications/rapps/rapps/zaz.txt
Simple merge

diff --cc base/applications/regedit/regproc.c
Simple merge

diff --cc base/applications/regedit/regproc.h
Simple merge

diff --cc base/applications/taskmgr/lang/ru-RU.rc
Simple merge

diff --cc base/setup/usetup/interface/usetup.c
Simple merge

diff --cc base/setup/usetup/native/fslist.c
Simple merge

diff --cc boot/bootdata/txtsetup.sif
Simple merge

diff --cc cmake/gcc.cmake
Simple merge

diff --cc cmake/msvc.cmake
Simple merge

diff --cc configure.cmd
Simple merge

diff --cc configure.sh
Simple merge

diff --cc dll/3rdparty/libxslt/CMakeLists.txt
Simple merge

diff --cc dll/cpl/sysdm/general.c
Simple merge

diff --cc dll/cpl/sysdm/lang/bg-BG.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/cs-CZ.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/da-DK.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/de-DE.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/el-GR.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/en-US.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/es-ES.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/fr-FR.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/he-IL.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/hu-HU.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/id-ID.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/it-IT.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/ja-JP.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/nl-NL.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/no-NO.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/pl-PL.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/ro-RO.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/ru-RU.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/sk-SK.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/sq-AL.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/sv-SE.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/tr-TR.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/uk-UA.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/zh-CN.rc
Simple merge

diff --cc dll/cpl/sysdm/precomp.h
Simple merge

diff --cc dll/cpl/sysdm/resource.h
Simple merge

diff --cc dll/cpl/sysdm/resources/rosbitmap.bmp
index 8a94a6e,ee5891c..ee5891c
Binary files differ

diff --cc dll/cpl/sysdm/resources/rosbitmap_mask.bmp
index 0000000,9e0ef21..9e0ef21
mode 000000,100644..100644
Binary files differ

diff --cc dll/cpl/sysdm/sysdm.rc
Simple merge

diff --cc dll/cpl/sysdm/virtmem.c
Simple merge

diff --cc dll/cpl/usrmgr/lang/pl-PL.rc
Simple merge

diff --cc dll/directx/wine/amstream/amstream_classes.idl
Simple merge

diff --cc dll/directx/wine/amstream/mediastreamfilter.c
Simple merge

diff --cc dll/directx/wine/d3d8/buffer.c
Simple merge

diff --cc dll/directx/wine/d3d8/d3d8_main.c
Simple merge

diff --cc dll/directx/wine/d3d8/d3d8_private.h
Simple merge

diff --cc dll/directx/wine/d3d8/device.c
Simple merge

diff --cc dll/directx/wine/d3d8/directx.c
Simple merge

diff --cc dll/directx/wine/d3d8/surface.c
Simple merge

diff --cc dll/directx/wine/d3d8/texture.c
Simple merge

diff --cc dll/directx/wine/d3d8/volume.c
Simple merge

diff --cc dll/directx/wine/d3d9/buffer.c
Simple merge

diff --cc dll/directx/wine/d3d9/d3d9_main.c
Simple merge

diff --cc dll/directx/wine/d3d9/d3d9_private.h
Simple merge

diff --cc dll/directx/wine/d3d9/device.c
Simple merge

diff --cc dll/directx/wine/d3d9/directx.c
Simple merge

diff --cc dll/directx/wine/d3d9/query.c
Simple merge

diff --cc dll/directx/wine/d3d9/surface.c
Simple merge

diff --cc dll/directx/wine/d3d9/texture.c
Simple merge

diff --cc dll/directx/wine/d3d9/volume.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/asmparser.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/asmshader.tab.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/asmshader.tab.h
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/asmshader.y
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/asmshader.yy.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/compiler.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/hlsl.yy.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/reflection.c
Simple merge

diff --cc dll/directx/wine/d3dcompiler_43/utils.c
Simple merge

diff --cc dll/directx/wine/d3dx9_24/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_25/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_26/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_27/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_28/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_29/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_30/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_31/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_32/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_33/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_34/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_35/version.rc
Simple merge

diff --cc dll/directx/wine/d3dx9_36/core.c
Simple merge

diff --cc dll/directx/wine/d3dx9_36/d3dx9_36_main.c
Simple merge

diff --cc dll/directx/wine/d3dx9_36/d3dx9_36_private.h
Simple merge

diff --cc dll/directx/wine/d3dx9_36/effect.c
Simple merge

diff --cc dll/directx/wine/d3dx9_36/line.c
Simple merge

diff --cc dll/directx/wine/d3dx9_36/math.c
Simple merge

diff --cc dll/directx/wine/d3dx9_36/mesh.c
Simple merge

diff --cc dll/directx/wine/d3dx9_36/render.c
Simple merge

diff --cc dll/directx/wine/d3dx9_36/shader.c
Simple merge