* Sync up to trunk head (r64716).

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

diff --cc CMakeLists.txt
Simple merge

diff --cc base/applications/charmap/settings.c
Simple merge

diff --cc base/applications/cmdutils/reg/lang/bg-BG.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/cs-CZ.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/da-DK.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/de-DE.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/en-US.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/es-ES.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/fr-FR.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/it-IT.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/ja-JP.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/ko-KR.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/lt-LT.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/nl-NL.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/no-NO.rc
Simple merge

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

diff --cc base/applications/cmdutils/reg/lang/pt-PT.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/ro-RO.rc
Simple merge

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

diff --cc base/applications/cmdutils/reg/lang/sl-SI.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/sq-AL.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/sv-SE.rc
Simple merge

diff --cc base/applications/cmdutils/reg/lang/uk-UA.rc
Simple merge

diff --cc base/applications/cmdutils/reg/reg.c
Simple merge

diff --cc base/applications/cmdutils/reg/reg.h
Simple merge

diff --cc base/applications/cmdutils/taskkill/lang/de-DE.rc
Simple merge

diff --cc base/applications/cmdutils/taskkill/lang/en-US.rc
Simple merge

diff --cc base/applications/cmdutils/taskkill/lang/ro-RO.rc
Simple merge

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

diff --cc base/applications/cmdutils/taskkill/lang/sq-AL.rc
Simple merge

diff --cc base/applications/cmdutils/taskkill/taskkill.c
Simple merge

diff --cc base/applications/cmdutils/wmic/lang/de-DE.rc
Simple merge

diff --cc base/applications/cmdutils/wmic/lang/en-US.rc
Simple merge

diff --cc base/applications/cmdutils/wmic/lang/ro-RO.rc
Simple merge

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

diff --cc base/applications/cmdutils/wmic/lang/sq-AL.rc
Simple merge

diff --cc base/applications/cmdutils/wmic/main.c
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Da.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/De.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/En.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Es.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Fr.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/It.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Ja.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Ko.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Lt.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Nl.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/No.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Pl.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Pt.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Ro.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Ru.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Si.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Sq.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Sr.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Sv.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/lang/Uk.rc
Simple merge

diff --cc base/applications/cmdutils/xcopy/xcopy.c
Simple merge

diff --cc base/applications/cmdutils/xcopy/xcopy.h
Simple merge

diff --cc base/applications/kbswitch/kbswitch.c
Simple merge

diff --cc base/applications/mplay32/mplay32.c
Simple merge

diff --cc base/applications/mscutils/devmgmt/enumdevices.c
Simple merge

diff --cc base/applications/mscutils/devmgmt/precomp.h
Simple merge

diff --cc base/applications/mscutils/eventvwr/eventvwr.c
Simple merge

diff --cc base/applications/mspaint/dib.c
Simple merge

diff --cc base/applications/notepad/main.c
Simple merge

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

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

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

diff --cc base/applications/taskmgr/graph.c
Simple merge

diff --cc base/applications/taskmgr/graphctl.c
Simple merge

diff --cc base/applications/taskmgr/perfpage.c
Simple merge

diff --cc base/applications/taskmgr/procpage.c
Simple merge

diff --cc base/applications/winhlp32/hlpfile.c
Simple merge

diff --cc base/applications/winhlp32/hlpfile.h
Simple merge

diff --cc base/applications/winhlp32/lang/Bg.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Cs.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Da.rc
Simple merge

diff --cc base/applications/winhlp32/lang/De.rc
Simple merge

diff --cc base/applications/winhlp32/lang/En.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Es.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Fi.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Fr.rc
Simple merge

diff --cc base/applications/winhlp32/lang/He.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Hu.rc
Simple merge

diff --cc base/applications/winhlp32/lang/It.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Ja.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Ko.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Lt.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Nl.rc
Simple merge

diff --cc base/applications/winhlp32/lang/No.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Pl.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Pt.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Rm.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Ro.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Ru.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Si.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Sk.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Sq.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Sr.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Sv.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Tr.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Uk.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Zh.rc
Simple merge

diff --cc base/applications/winhlp32/macro.c
Simple merge

diff --cc base/applications/winhlp32/rsrc.rc
Simple merge

diff --cc base/applications/winhlp32/winhelp.c
Simple merge

diff --cc base/applications/winhlp32/winhelp_res.h
Simple merge

diff --cc base/applications/wordpad/lang/Da.rc
Simple merge

diff --cc base/applications/wordpad/lang/De.rc
Simple merge

diff --cc base/applications/wordpad/lang/En.rc
Simple merge

diff --cc base/applications/wordpad/lang/Fr.rc
Simple merge

diff --cc base/applications/wordpad/lang/He.rc
Simple merge

diff --cc base/applications/wordpad/lang/Hu.rc
Simple merge

diff --cc base/applications/wordpad/lang/It.rc
Simple merge

diff --cc base/applications/wordpad/lang/Ja.rc
Simple merge

diff --cc base/applications/wordpad/lang/Ko.rc
Simple merge

diff --cc base/applications/wordpad/lang/Lt.rc
Simple merge

diff --cc base/applications/wordpad/lang/Nl.rc
Simple merge

diff --cc base/applications/wordpad/lang/No.rc
Simple merge

diff --cc base/applications/wordpad/lang/Pl.rc
Simple merge

diff --cc base/applications/wordpad/lang/Pt.rc
Simple merge

diff --cc base/applications/wordpad/lang/Ro.rc
Simple merge

diff --cc base/applications/wordpad/lang/Ru.rc
Simple merge

diff --cc base/applications/wordpad/lang/Si.rc
Simple merge

diff --cc base/applications/wordpad/lang/Sq.rc
Simple merge

diff --cc base/applications/wordpad/lang/Sv.rc
Simple merge

diff --cc base/applications/wordpad/lang/Tr.rc
Simple merge

diff --cc base/applications/wordpad/lang/Uk.rc
Simple merge

diff --cc base/applications/wordpad/lang/Zh.rc
Simple merge

diff --cc base/applications/wordpad/res/wordpad.ico
index 4dfa141,904f039..904f039
Binary files differ

diff --cc base/applications/wordpad/rsrc.rc
Simple merge

diff --cc base/services/eventlog/rpc.c
Simple merge

diff --cc base/services/rpcss/epm.idl
Simple merge

diff --cc base/services/rpcss/irot.idl
Simple merge

diff --cc base/services/rpcss/rpcss_main.c
Simple merge

diff --cc base/services/tftpd/CMakeLists.txt
Simple merge

diff --cc base/services/tftpd/README.txt
Simple merge

diff --cc base/services/tftpd/tftpd.cpp
Simple merge

diff --cc base/services/tftpd/tftpd.h
Simple merge

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

diff --cc base/system/msiexec/msiexec.c
Simple merge

diff --cc base/system/msiexec/service.c
Simple merge

diff --cc boot/freeldr/CMakeLists.txt
Simple merge

diff --cc boot/freeldr/fdebug/CMakeLists.txt
index 0000000,6fed628..6fed628
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/boot/freeldr/fdebug/CMakeLists.txt
+++ b/boot/freeldr/fdebug/CMakeLists.txt

diff --cc boot/freeldr/fdebug/fdebug.c
Simple merge

diff --cc boot/freeldr/fdebug/fdebug.rc
Simple merge

diff --cc boot/freeldr/fdebug/lang/ro-RO.rc
Simple merge

diff --cc boot/freeldr/freeldr/CMakeLists.txt
Simple merge

diff --cc cmake/CMakeMacros.cmake
Simple merge

diff --cc cmake/Platform/Windows-MSVC.cmake
Simple merge

diff --cc cmake/baseaddress_dwarf.cmake
index 0000000,19d7c89..19d7c89
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/cmake/baseaddress_dwarf.cmake
+++ b/cmake/baseaddress_dwarf.cmake

diff --cc cmake/config.cmake
Simple merge

diff --cc cmake/gcc.cmake
Simple merge

diff --cc cmake/msvc.cmake
Simple merge

diff --cc dll/cpl/inetcpl/lang/He.rc
Simple merge

diff --cc dll/cpl/inetcpl/lang/Sr.rc
Simple merge

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

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

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

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

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

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

diff --cc dll/cpl/inetcpl/lang/ko-KR.rc
Simple merge

diff --cc dll/cpl/inetcpl/lang/lt-LT.rc
Simple merge

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

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

diff --cc dll/cpl/inetcpl/lang/pt-BR.rc
Simple merge

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

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

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

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

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

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

diff --cc dll/ntdll/dbg/dbgui.c
Simple merge

diff --cc dll/ntdll/ldr/ldrapi.c
Simple merge

diff --cc dll/win32/advapi32/misc/logon.c
Simple merge

diff --cc dll/win32/advapi32/reg/hkcr.c
Simple merge

diff --cc dll/win32/advapi32/reg/reg.c
Simple merge

diff --cc dll/win32/advapi32/reg/reg.h
Simple merge

diff --cc dll/win32/advapi32/sec/misc.c
Simple merge

diff --cc dll/win32/advapi32/token/token.c
Simple merge

diff --cc dll/win32/avifil32/lang/avifile_Bg.rc
Simple merge

diff --cc dll/win32/avifil32/lang/avifile_Cs.rc
Simple merge

diff --cc dll/win32/avifil32/lang/avifile_Hu.rc
Simple merge

diff --cc dll/win32/credui/credui.rc
Simple merge

diff --cc dll/win32/credui/credui_resources.h
Simple merge

diff --cc dll/win32/credui/lang/credui_Da.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_De.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_En.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Es.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Fr.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_He.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Hu.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_It.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Ko.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Lt.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Nl.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_No.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Pl.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Pt.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Ro.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Ru.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Si.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Sq.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Sv.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Tr.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Uk.rc
Simple merge

diff --cc dll/win32/credui/lang/credui_Zh.rc
Simple merge

diff --cc dll/win32/crypt32/lang/crypt32_Lt.rc
Simple merge

diff --cc dll/win32/crypt32/lang/crypt32_Sv.rc
Simple merge

diff --cc dll/win32/cryptdlg/cryptdlg.rc
Simple merge

diff --cc dll/win32/cryptdlg/cryptdlg.spec
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Da.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_De.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_En.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Fr.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_He.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Hu.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_It.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Ko.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Lt.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Nl.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_No.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Pl.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Pt.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Ro.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Sq.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Tr.rc
Simple merge

diff --cc dll/win32/cryptdlg/lang/cryptdlg_Uk.rc
Simple merge

diff --cc dll/win32/devmgr/advprop.c
Simple merge

diff --cc dll/win32/devmgr/devprblm.c
Simple merge

diff --cc dll/win32/devmgr/hwpage.c
Simple merge

diff --cc dll/win32/devmgr/hwresource.c
Simple merge

diff --cc dll/win32/devmgr/lang/bg-BG.rc
Simple merge

diff --cc dll/win32/devmgr/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/devmgr/lang/de-DE.rc
Simple merge

diff --cc dll/win32/devmgr/lang/el-GR.rc
Simple merge

diff --cc dll/win32/devmgr/lang/en-US.rc
Simple merge

diff --cc dll/win32/devmgr/lang/es-ES.rc
Simple merge

diff --cc dll/win32/devmgr/lang/fr-FR.rc
Simple merge

diff --cc dll/win32/devmgr/lang/he-IL.rc
Simple merge

diff --cc dll/win32/devmgr/lang/hu-HU.rc
Simple merge

diff --cc dll/win32/devmgr/lang/id-ID.rc
Simple merge

diff --cc dll/win32/devmgr/lang/it-IT.rc
Simple merge

diff --cc dll/win32/devmgr/lang/no-NO.rc
Simple merge

diff --cc dll/win32/devmgr/lang/pl-PL.rc
Simple merge

diff --cc dll/win32/devmgr/lang/pt-BR.rc
Simple merge

diff --cc dll/win32/devmgr/lang/ro-RO.rc
Simple merge

diff --cc dll/win32/devmgr/lang/ru-RU.rc
Simple merge

diff --cc dll/win32/devmgr/lang/sk-SK.rc
Simple merge

diff --cc dll/win32/devmgr/lang/sq-AL.rc
Simple merge

diff --cc dll/win32/devmgr/lang/tr-TR.rc
Simple merge

diff --cc dll/win32/devmgr/lang/uk-UA.rc
Simple merge

diff --cc dll/win32/devmgr/misc.c
Simple merge

diff --cc dll/win32/devmgr/precomp.h
Simple merge

diff --cc dll/win32/devmgr/stubs.c
Simple merge

diff --cc dll/win32/framedyn/CMakeLists.txt
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Cy.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Da.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_De.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_En.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Es.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Fr.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_He.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Hu.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_It.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Ja.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Ko.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Lt.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Nl.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_No.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Pl.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Pt.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Ro.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Ru.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Si.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Sq.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Sv.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Tr.rc
Simple merge

diff --cc dll/win32/iccvid/lang/iccvid_Uk.rc
Simple merge

diff --cc dll/win32/iccvid/rsrc.rc
Simple merge

diff --cc dll/win32/kernel32/CMakeLists.txt
Simple merge

diff --cc dll/win32/kernel32/client/utils.c
Simple merge

diff --cc dll/win32/localspl/lang/spl_Sq.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Da.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_De.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_En.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Es.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Fr.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_He.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Hu.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_It.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Ja.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Ko.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Lt.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Nl.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_No.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Pl.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Pt.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Ro.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Ru.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Si.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Sq.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Sv.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Tr.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Uk.rc
Simple merge

diff --cc dll/win32/localui/lang/ui_Zh.rc
Simple merge

diff --cc dll/win32/localui/localui.rc
Simple merge

diff --cc dll/win32/mapi32/lang/Da.rc
Simple merge

diff --cc dll/win32/mapi32/lang/Ga.rc
Simple merge

diff --cc dll/win32/mapi32/lang/Sq.rc
Simple merge

diff --cc dll/win32/msi/CMakeLists.txt
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Cy.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Da.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_De.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_En.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Es.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Fr.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Hu.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_It.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Ja.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Ko.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Lt.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Nl.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_No.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Pl.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Pt.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Ro.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Ru.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Si.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Sq.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Sv.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Tr.rc
Simple merge

diff --cc dll/win32/msvidc32/lang/msvidc32_Uk.rc
Simple merge

diff --cc dll/win32/msvidc32/msvidc32_private.h
Simple merge

diff --cc dll/win32/msvidc32/rsrc.rc
Simple merge

diff --cc dll/win32/newdev/lang/bg-BG.rc
Simple merge

diff --cc dll/win32/newdev/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/newdev/lang/de-DE.rc
Simple merge

diff --cc dll/win32/newdev/lang/el-GR.rc
Simple merge

diff --cc dll/win32/newdev/lang/en-US.rc
Simple merge

diff --cc dll/win32/newdev/lang/es-ES.rc
Simple merge

diff --cc dll/win32/newdev/lang/fr-FR.rc
Simple merge

diff --cc dll/win32/newdev/lang/he-IL.rc
Simple merge

diff --cc dll/win32/newdev/lang/hu-HU.rc
Simple merge

diff --cc dll/win32/newdev/lang/id-ID.rc
Simple merge

diff --cc dll/win32/newdev/lang/it-IT.rc
Simple merge

diff --cc dll/win32/newdev/lang/ja-JP.rc
Simple merge

diff --cc dll/win32/newdev/lang/nl-NL.rc
Simple merge

diff --cc dll/win32/newdev/lang/no-NO.rc
Simple merge

diff --cc dll/win32/newdev/lang/pl-PL.rc
Simple merge

diff --cc dll/win32/newdev/lang/ro-RO.rc
Simple merge

diff --cc dll/win32/newdev/lang/ru-RU.rc
Simple merge

diff --cc dll/win32/newdev/lang/sk-SK.rc
Simple merge

diff --cc dll/win32/newdev/lang/sq-AL.rc
Simple merge

diff --cc dll/win32/newdev/lang/th-TH.rc
Simple merge

diff --cc dll/win32/newdev/lang/tr-TR.rc
Simple merge

diff --cc dll/win32/newdev/lang/uk-UA.rc
Simple merge

diff --cc dll/win32/newdev/newdev.c
Simple merge

diff --cc dll/win32/newdev/newdev.spec
Simple merge

diff --cc dll/win32/newdev/newdev_private.h
Simple merge

diff --cc dll/win32/newdev/resource.h
Simple merge

diff --cc dll/win32/newdev/wizard.c
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Cs.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Da.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_De.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_En.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Es.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Fr.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_He.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Hu.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_It.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Ja.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Ko.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Lt.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Nl.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_No.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Pl.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Pt.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Ro.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Ru.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Si.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Sq.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Sv.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Tr.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Uk.rc
Simple merge

diff --cc dll/win32/oledlg/lang/oledlg_Zh.rc
Simple merge

diff --cc dll/win32/pdh/pdh.spec
Simple merge

diff --cc dll/win32/pdh/pdh_main.c
Simple merge

diff --cc dll/win32/propsys/propsys.spec
Simple merge

diff --cc dll/win32/propsys/propsys_main.c
Simple merge

diff --cc dll/win32/rasapi32/rasapi.c
Simple merge

diff --cc dll/win32/riched20/caret.c
Simple merge

diff --cc dll/win32/riched20/clipboard.c
Simple merge

diff --cc dll/win32/riched20/editor.c
Simple merge

diff --cc dll/win32/riched20/editor.h
Simple merge

diff --cc dll/win32/riched20/editstr.h
Simple merge

diff --cc dll/win32/riched20/reader.c
Simple merge

diff --cc dll/win32/riched20/richole.c
Simple merge

diff --cc dll/win32/riched20/string.c
Simple merge

diff --cc dll/win32/riched20/txtsrv.c
Simple merge

diff --cc dll/win32/rsaenh/rsaenh.c
Simple merge

diff --cc dll/win32/schannel/schannel_main.c
Simple merge

diff --cc dll/win32/scrrun/filesystem.c
Simple merge

diff --cc dll/win32/secur32/sspi.c
Simple merge

diff --cc dll/win32/setupapi/devclass.c
Simple merge

diff --cc dll/win32/setupapi/devinst.c
Simple merge

diff --cc dll/win32/setupapi/misc.c
Simple merge

diff --cc dll/win32/setupapi/setupapi_private.h
Simple merge

diff --cc dll/win32/shdocvw/shdocvw.spec
Simple merge

diff --cc dll/win32/shdocvw/shdocvw_main.c
Simple merge

diff --cc dll/win32/shell32/CMakeLists.txt
index d3b5d7a,0000000..4ab943b
mode 100644,000000..100644
--- 1/dll/win32/shell32/CMakeLists.txt
--- /dev/null
+++ b/dll/win32/shell32/CMakeLists.txt
@@@ -1,115 -1,0 +1,114 @@@
- add_dependencies(shell32 shdocvw_v1)
 +PROJECT(SHELL)
 +
 +set_cpp(WITH_RUNTIME)
 +
 +remove_definitions(-D_WIN32_WINNT=0x502)
 +add_definitions(-D_WIN32_WINNT=0x600)
 +
 +add_definitions(
 +    -D_SHELL32_
 +    -D_WINE)
 +
 +include_directories(
 +    ${REACTOS_SOURCE_DIR}/lib/recyclebin
 +    ${REACTOS_SOURCE_DIR}/lib/atl
 +    ${REACTOS_SOURCE_DIR})
 +
 +spec2def(shell32.dll shell32.spec ADD_IMPORTLIB)
 +
 +list(APPEND SOURCE
 +    #authors.cpp
 +    autocomplete.cpp
 +    brsfolder.cpp
 +    changenotify.cpp
 +    classes.cpp
 +    clipboard.cpp
 +    control.cpp
 +    CMenuBand.cpp
 +    CMenuDeskBar.cpp
 +    dataobject.cpp
 +    dde.cpp
 +    debughlp.cpp
 +    desktop.cpp
 +    dialogs.cpp
 +    dragdrophelper.cpp
 +    enumidlist.cpp
 +    extracticon.cpp
 +    folders.cpp
 +    iconcache.cpp
 +    pidl.cpp
 +    shell32_main.cpp
 +    shellitem.cpp
 +    shelllink.cpp
 +    shellole.cpp
 +    shellord.cpp
 +    shellpath.cpp
 +    shellreg.cpp
 +    shellstring.cpp
 +    folders/desktop.cpp
 +    folders/fs.cpp
 +    folders/mycomp.cpp
 +    folders/mydocuments.cpp
 +    folders/printers.cpp
 +    folders/admintools.cpp
 +    folders/netplaces.cpp
 +    folders/fonts.cpp
 +    folders/cpanel.cpp
 +    folders/recyclebin.cpp
 +    droptargets/CexeDropHandler.cpp
 +    shlexec.cpp
 +    shlfileop.cpp
 +    shlfolder.cpp
 +    shlfsbind.cpp
 +    shlmenu.cpp
 +    shlview.cpp
 +    shpolicy.cpp
 +    stubs.cpp
 +    systray.cpp
 +    fprop.cpp
 +    drive.cpp
 +    defcontextmenu.cpp
 +    openwithmenu.cpp
 +    newmenu.cpp
 +    startmenu.cpp
 +    folder_options.cpp
 +    filedefext.cpp
 +    drvdefext.cpp
 +    precomp.h)
 +
 +add_library(shell32 SHARED
 +    ${SOURCE}
 +    vista.c
 +    shell32.rc
 +    ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
 +
 +set_module_type(shell32 win32dll UNICODE HOTPATCHABLE)
 +
 +target_link_libraries(shell32
 +    atlnew
 +    wine
 +    uuid
 +    recyclebin)
 +
 +add_delay_importlibs(shell32 ole32 version fmifs)
 +
 +add_importlibs(shell32
 +    advapi32
 +    browseui
 +    gdi32
 +    user32
 +    powrprof
 +    comctl32
 +    comdlg32
 +    shdocvw
 +    shlwapi
 +    devmgr
 +    winspool
 +    winmm
 +    msvcrt
 +    kernel32
 +    ntdll)
 +
 +add_pch(shell32 precomp.h SOURCE)
 +add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)

diff --cc dll/win32/ufatx/CMakeLists.txt
Simple merge

diff --cc dll/win32/usp10/CMakeLists.txt
Simple merge

diff --cc dll/win32/usp10/bidi.c
Simple merge

diff --cc dll/win32/usp10/bracket.c
index 0000000,20df6fa..20df6fa
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/usp10/bracket.c
+++ b/dll/win32/usp10/bracket.c

diff --cc dll/win32/usp10/breaking.c
Simple merge

diff --cc dll/win32/usp10/indicsyllable.c
Simple merge

diff --cc dll/win32/usp10/linebreak.c
Simple merge

diff --cc dll/win32/usp10/mirror.c
Simple merge

diff --cc dll/win32/usp10/shape.c
Simple merge

diff --cc dll/win32/usp10/shaping.c
Simple merge

diff --cc dll/win32/usp10/usp10.c
Simple merge

diff --cc dll/win32/uxtheme/uxthemep.h
Simple merge

diff --cc dll/win32/vbscript/compile.c
Simple merge

diff --cc dll/win32/vbscript/global.c
Simple merge

diff --cc dll/win32/vbscript/interp.c
Simple merge

diff --cc dll/win32/vbscript/lex.c
Simple merge

diff --cc dll/win32/vbscript/parser.tab.c
Simple merge

diff --cc dll/win32/vbscript/parser.tab.h
Simple merge

diff --cc dll/win32/vbscript/parser.y
Simple merge

diff --cc dll/win32/vbscript/vbdisp.c
Simple merge

diff --cc dll/win32/vbscript/vbscript.h
Simple merge

diff --cc dll/win32/wbemprox/CMakeLists.txt
Simple merge

diff --cc dll/win32/wbemprox/builtin.c
Simple merge

diff --cc dll/win32/wbemprox/class.c
Simple merge

diff --cc dll/win32/wbemprox/main.c
Simple merge

diff --cc dll/win32/wbemprox/process.c
Simple merge

diff --cc dll/win32/wbemprox/query.c
Simple merge

diff --cc dll/win32/wbemprox/reg.c
Simple merge

diff --cc dll/win32/wbemprox/security.c
index 0000000,f73827c..f73827c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/wbemprox/security.c
+++ b/dll/win32/wbemprox/security.c

diff --cc dll/win32/wbemprox/service.c
Simple merge

diff --cc dll/win32/wbemprox/table.c
Simple merge

diff --cc dll/win32/wbemprox/wbemprox_private.h
Simple merge

diff --cc dll/win32/wbemprox/wql.tab.c
Simple merge

diff --cc dll/win32/windowscodecs/bmpencode.c
Simple merge

diff --cc dll/win32/windowscodecs/icnsformat.c
Simple merge

diff --cc dll/win32/windowscodecs/imgfactory.c
Simple merge

diff --cc dll/win32/windowscodecs/jpegformat.c
Simple merge

diff --cc dll/win32/windowscodecs/main.c
Simple merge

diff --cc dll/win32/windowscodecs/pngformat.c
Simple merge

diff --cc dll/win32/windowscodecs/propertybag.c
Simple merge

diff --cc dll/win32/windowscodecs/proxy.c
Simple merge

diff --cc dll/win32/windowscodecs/tiffformat.c
Simple merge

diff --cc dll/win32/windowscodecs/typeof.h
Simple merge

diff --cc dll/win32/windowscodecs/ungif.c
Simple merge

diff --cc dll/win32/windowscodecs/wincodecs_private.h
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Bg.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Cs.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Da.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_De.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_En.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Eo.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Es.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Fi.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Fr.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_He.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Hu.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_It.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Ja.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Ko.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Lt.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Nl.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_No.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Pl.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Pt.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Ro.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Ru.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Si.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Sq.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Sr.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Sv.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Tr.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Uk.rc
Simple merge

diff --cc dll/win32/wininet/lang/wininet_Zh.rc
Simple merge

diff --cc dll/win32/wininet/version.rc
Simple merge

diff --cc dll/win32/wintrust/register.c
Simple merge

diff --cc dll/win32/wintrust/wintrust_main.c
Simple merge

diff --cc dll/win32/wldap32/lang/wldap32_En.rc
Simple merge

diff --cc dll/win32/wldap32/lang/wldap32_He.rc
Simple merge

diff --cc dll/win32/wshtcpip/wshtcpip.c
Simple merge

diff --cc dll/win32/xmllite/reader.c
Simple merge

diff --cc dll/win32/xmllite/writer.c
Simple merge

diff --cc dll/win32/xmllite/xmllite_private.h
Simple merge

diff --cc drivers/base/bootvid/CMakeLists.txt
Simple merge

diff --cc drivers/base/kdrosdbg/CMakeLists.txt
Simple merge

diff --cc drivers/filesystems/ntfs/attrib.c
Simple merge

diff --cc drivers/filesystems/ntfs/close.c
Simple merge

diff --cc drivers/filesystems/ntfs/create.c
Simple merge

diff --cc drivers/filesystems/ntfs/fcb.c
Simple merge

diff --cc drivers/filesystems/ntfs/mft.c
Simple merge

diff --cc drivers/filesystems/ntfs/ntfs.h
Simple merge

diff --cc drivers/hid/hidclass/CMakeLists.txt
Simple merge

diff --cc drivers/ksfilter/ks/CMakeLists.txt
Simple merge

diff --cc drivers/network/tcpip/CMakeLists.txt
Simple merge

diff --cc drivers/network/tcpip/include/info.h
Simple merge

diff --cc drivers/network/tcpip/include/tcp.h
Simple merge

diff --cc drivers/network/tcpip/tcpip/cinfo.c
index 0000000,184532c..184532c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/network/tcpip/tcpip/cinfo.c
+++ b/drivers/network/tcpip/tcpip/cinfo.c

diff --cc drivers/network/tcpip/tcpip/info.c
Simple merge

diff --cc hal/halx86/CMakeLists.txt
Simple merge

diff --cc include/crt/mingw32/intrin_x86.h
Simple merge

diff --cc include/crt/msc/intrin.h
Simple merge

diff --cc include/crt/stdio.h
Simple merge

diff --cc include/ddk/ntifs.h
Simple merge

diff --cc include/ddk/wdm.h
Simple merge

diff --cc include/ndk/umtypes.h
Simple merge

diff --cc include/psdk/bcrypt.h
Simple merge

diff --cc include/psdk/dbt.h
Simple merge

diff --cc include/psdk/iads.idl
Simple merge

diff --cc include/psdk/ntdef.h
Simple merge

diff --cc include/psdk/propsys.idl
Simple merge

diff --cc include/psdk/tcpioctl.h
Simple merge

diff --cc include/psdk/wincrypt.h
Simple merge

diff --cc include/psdk/winnt.h
Simple merge

diff --cc include/reactos/dll/newdevp.h
index 0000000,36226cc..36226cc
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/include/reactos/dll/newdevp.h
+++ b/include/reactos/dll/newdevp.h

diff --cc include/reactos/libs/fast486/fast486.h
Simple merge

diff --cc include/reactos/mc/bugcodes.mc
Simple merge

diff --cc include/xdk/fsrtlfuncs.h
Simple merge

diff --cc include/xdk/iotypes.h
Simple merge

diff --cc include/xdk/ntdef.template.h
Simple merge

diff --cc include/xdk/rtltypes.h
Simple merge

diff --cc include/xdk/winnt_old.h
Simple merge

diff --cc lib/3rdparty/libwine/debug.c
Simple merge

diff --cc lib/CMakeLists.txt
Simple merge

diff --cc lib/drivers/ip/transport/tcp/tcp.c
Simple merge

diff --cc lib/drivers/lwip/src/include/rosip.h
Simple merge

diff --cc lib/drivers/lwip/src/rostcp.c
Simple merge

diff --cc lib/fast486/common.c
Simple merge

diff --cc lib/fast486/common.h
Simple merge

diff --cc lib/fast486/common.inl
Simple merge

diff --cc lib/fast486/extraops.c
Simple merge

diff --cc lib/fast486/extraops.h
Simple merge

diff --cc lib/fast486/fast486.c
Simple merge

diff --cc lib/fast486/fpu.c
Simple merge

diff --cc lib/fast486/fpu.h
Simple merge

diff --cc lib/fast486/opcodes.c
Simple merge

diff --cc lib/fast486/opcodes.h
Simple merge

diff --cc lib/fast486/opgroups.c
Simple merge

diff --cc lib/fast486/opgroups.h
Simple merge

diff --cc lib/gcc_ssp/CMakeLists.txt
index 0000000,389e629..389e629
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/gcc_ssp/CMakeLists.txt
+++ b/lib/gcc_ssp/CMakeLists.txt

diff --cc lib/gcc_ssp/gcc_ssp.c
index 0000000,58e662c..58e662c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/lib/gcc_ssp/gcc_ssp.c
+++ b/lib/gcc_ssp/gcc_ssp.c

diff --cc lib/pseh/i386/seh.s
Simple merge

diff --cc lib/rtl/avlsupp.c
Simple merge

diff --cc lib/rtl/critical.c
Simple merge

diff --cc lib/sdk/crt/except/i386/seh.s
Simple merge

diff --cc lib/sdk/crt/misc/i10output.c
Simple merge

diff --cc lib/sdk/crt/msvcrtex.cmake
Simple merge

diff --cc lib/sdk/crt/startup/gs_support.c
Simple merge

diff --cc lib/sdk/crt/startup/mscmain.c
Simple merge

diff --cc lib/sdk/crt/stdio/file.c
Simple merge

diff --cc lib/sdk/scrnsave/scrnsave.c
Simple merge

diff --cc media/doc/README.WINE
Simple merge

diff --cc ntoskrnl/CMakeLists.txt
Simple merge

diff --cc ntoskrnl/cache/copysup.c
Simple merge

diff --cc ntoskrnl/cache/section/data.c
Simple merge

diff --cc ntoskrnl/cache/section/newmm.h
Simple merge

diff --cc ntoskrnl/cache/section/swapout.c
Simple merge

diff --cc ntoskrnl/cc/view.c
Simple merge

diff --cc ntoskrnl/include/internal/i386/ke.h
Simple merge

diff --cc ntoskrnl/include/internal/mm.h
Simple merge

diff --cc ntoskrnl/ke/i386/context.c
Simple merge

diff --cc ntoskrnl/ke/i386/ctxswitch.S
Simple merge

diff --cc ntoskrnl/ke/i386/exp.c
Simple merge

diff --cc ntoskrnl/ke/i386/irqobj.c
Simple merge

diff --cc ntoskrnl/ke/i386/trap.s
Simple merge

diff --cc ntoskrnl/ke/i386/traphdlr.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/miarm.h
Simple merge

diff --cc ntoskrnl/mm/ARM3/miavl.h
Simple merge

diff --cc ntoskrnl/mm/ARM3/pagfault.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/pfnlist.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/procsup.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/section.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/sysldr.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/vadnode.c
Simple merge

diff --cc ntoskrnl/mm/ARM3/virtual.c
Simple merge

diff --cc ntoskrnl/mm/amd64/page.c
Simple merge

diff --cc ntoskrnl/mm/arm/page.c
Simple merge

diff --cc ntoskrnl/mm/arm/stubs.c
Simple merge

diff --cc ntoskrnl/mm/balance.c
Simple merge

diff --cc ntoskrnl/mm/freelist.c
Simple merge

diff --cc ntoskrnl/mm/i386/page.c
Simple merge

diff --cc ntoskrnl/mm/i386/pagepae.c
Simple merge

diff --cc ntoskrnl/mm/marea.c
Simple merge

diff --cc ntoskrnl/mm/mmfault.c
Simple merge

diff --cc ntoskrnl/mm/mminit.c
Simple merge

diff --cc ntoskrnl/mm/pagefile.c
Simple merge

diff --cc ntoskrnl/mm/powerpc/page.c
Simple merge

diff --cc ntoskrnl/mm/region.c
Simple merge

diff --cc ntoskrnl/mm/rmap.c
Simple merge

diff --cc ntoskrnl/mm/section.c
Simple merge

diff --cc ntoskrnl/ntkrnlmp/CMakeLists.txt
Simple merge

diff --cc ntoskrnl/se/token.c
Simple merge

diff --cc subsystems/ntvdm/CMakeLists.txt
Simple merge

diff --cc subsystems/ntvdm/bios/bios.c
Simple merge

diff --cc subsystems/ntvdm/bios/bios.h
Simple merge

diff --cc subsystems/ntvdm/bios/bios32/bios32.c
Simple merge

diff --cc subsystems/ntvdm/cpu/callback.h
Simple merge

diff --cc subsystems/ntvdm/cpu/cpu.c
Simple merge

diff --cc subsystems/ntvdm/cpu/registers.c
Simple merge

diff --cc subsystems/ntvdm/cpu/registers.h
Simple merge

diff --cc subsystems/ntvdm/cpu/x86context.h
index 0000000,9c996ce..9c996ce
mode 000000,100644..100644