Sync with trunk head

svn path=/branches/header-work/; revision=46148

diff --cc base/services/wlansvc/rpcserver.c
Simple merge

diff --cc base/services/wlansvc/wlansvc.c
Simple merge

diff --cc base/services/wlansvc/wlansvc.rbuild
Simple merge

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

diff --cc boot/bootdata/packages/reactos.dff
Simple merge

diff --cc dll/directx/ksproxy/clockforward.cpp
Simple merge

diff --cc dll/directx/ksproxy/datatype.cpp
Simple merge

diff --cc dll/directx/ksproxy/enum_mediatypes.cpp
Simple merge

diff --cc dll/directx/ksproxy/input_pin.cpp
Simple merge

diff --cc dll/directx/ksproxy/ksproxy.cpp
Simple merge

diff --cc dll/directx/ksproxy/ksproxy.rc
Simple merge

diff --cc dll/directx/ksproxy/output_pin.cpp
Simple merge

diff --cc dll/directx/ksproxy/precomp.h
Simple merge

diff --cc dll/directx/ksproxy/proxy.cpp
Simple merge

diff --cc dll/directx/ksproxy/qualityforward.cpp
Simple merge

diff --cc dll/win32/avifil32/avifile_De.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Fr.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Ja.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Lt.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Ro.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Ru.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Si.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Tr.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Uk.rc
Simple merge

diff --cc dll/win32/avifil32/avifile_Zh.rc
Simple merge

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

diff --cc dll/win32/comdlg32/cdlg.h
Simple merge

diff --cc dll/win32/comdlg32/cdlg32.c
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Bg.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Ca.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Cs.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Da.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_De.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_El.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_En.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Eo.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Es.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Fi.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Fr.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Hu.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_It.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Ja.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Ko.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Lt.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Nl.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_No.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Pl.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Pt.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Ro.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Ru.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Si.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Sk.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Sv.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Th.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Tr.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Uk.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Wa.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_Zh.rc
Simple merge

diff --cc dll/win32/comdlg32/cdlg_xx.rc
Simple merge

diff --cc dll/win32/comdlg32/colordlg.c
Simple merge

diff --cc dll/win32/comdlg32/comdlg32.rbuild
Simple merge

diff --cc dll/win32/comdlg32/filedlg.c
Simple merge

diff --cc dll/win32/comdlg32/filedlg31.c
Simple merge

diff --cc dll/win32/comdlg32/filedlg31.h
Simple merge

diff --cc dll/win32/comdlg32/finddlg.c
Simple merge

diff --cc dll/win32/comdlg32/fontdlg.c
Simple merge

diff --cc dll/win32/comdlg32/printdlg.c
Simple merge

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

diff --cc dll/win32/gdi32/include/gdi32p.h
Simple merge

diff --cc dll/win32/gdi32/misc/stubs.c
Simple merge

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

diff --cc dll/win32/hnetcfg/hnetcfg.rbuild
Simple merge

diff --cc dll/win32/hnetcfg/hnetcfg_private.h
Simple merge

diff --cc dll/win32/hnetcfg/port.c
index 0000000,c80b5f7..c80b5f7
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/hnetcfg/port.c
+++ b/dll/win32/hnetcfg/port.c

diff --cc dll/win32/hnetcfg/profile.c
Simple merge

diff --cc dll/win32/hnetcfg/regsvr.c
Simple merge

diff --cc dll/win32/hnetcfg/service.c
index 0000000,ecfc00c..ecfc00c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/hnetcfg/service.c
+++ b/dll/win32/hnetcfg/service.c

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

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

diff --cc dll/win32/kernel32/kernel32.pspec
Simple merge

diff --cc dll/win32/kernel32/misc/console.c
Simple merge

diff --cc dll/win32/kernel32/misc/dllmain.c
Simple merge

diff --cc dll/win32/kernel32/process/procsup.c
Simple merge

diff --cc dll/win32/kernel32/thread/thread.c
Simple merge

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

diff --cc dll/win32/localspl/localspl_private.h
Simple merge

diff --cc dll/win32/localspl/provider.c
Simple merge

diff --cc dll/win32/localspl/spl_Da.rc
Simple merge

diff --cc dll/win32/localspl/spl_De.rc
Simple merge

diff --cc dll/win32/localspl/spl_En.rc
Simple merge

diff --cc dll/win32/localspl/spl_Es.rc
index 0000000,9b9a558..9b9a558
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/localspl/spl_Es.rc
+++ b/dll/win32/localspl/spl_Es.rc

diff --cc dll/win32/localspl/spl_Fr.rc
Simple merge

diff --cc dll/win32/localspl/spl_Ko.rc
Simple merge

diff --cc dll/win32/localspl/spl_Lt.rc
index 0000000,4c72767..4c72767
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/localspl/spl_Lt.rc
+++ b/dll/win32/localspl/spl_Lt.rc

diff --cc dll/win32/localspl/spl_Nl.rc
Simple merge

diff --cc dll/win32/localspl/spl_No.rc
Simple merge

diff --cc dll/win32/localspl/spl_Pl.rc
Simple merge

diff --cc dll/win32/localspl/spl_Pt.rc
Simple merge

diff --cc dll/win32/localspl/spl_Ro.rc
Simple merge

diff --cc dll/win32/localspl/spl_Ru.rc
Simple merge

diff --cc dll/win32/localspl/spl_Si.rc
Simple merge

diff --cc dll/win32/localspl/spl_Sv.rc
Simple merge

diff --cc dll/win32/localspl/spl_Zh.rc
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc dll/win32/mciavi32/info.c
Simple merge

diff --cc dll/win32/mciavi32/mciavi.c
Simple merge

diff --cc dll/win32/mciavi32/mciavi_res.rc
Simple merge

diff --cc dll/win32/mciavi32/mmoutput.c
Simple merge

diff --cc dll/win32/mciavi32/wnd.c
Simple merge

diff --cc dll/win32/mciqtz32/mciqtz.c
Simple merge

diff --cc dll/win32/mciseq/mcimidi.c
Simple merge

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

diff --cc dll/win32/mscms/profile.c
Simple merge

diff --cc dll/win32/msg711.acm/msg711.c
Simple merge

diff --cc dll/win32/msgsm32.acm/msgsm32.c
Simple merge

diff --cc dll/win32/msimtf/activeimmapp.c
Simple merge

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

diff --cc dll/win32/msnet32/msnet_main.c
Simple merge

diff --cc dll/win32/msrle32/msrle_Bg.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Cs.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Da.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_De.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_En.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Es.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Fr.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Hu.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_It.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Ja.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Ko.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Lt.rc
index 0000000,f399f54..f399f54
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msrle32/msrle_Lt.rc
+++ b/dll/win32/msrle32/msrle_Lt.rc

diff --cc dll/win32/msrle32/msrle_Nl.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_No.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Pl.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Pt.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Ro.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Ru.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Si.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Sv.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Tr.rc
Simple merge

diff --cc dll/win32/msrle32/msrle_Uk.rc
index 0000000,19c4d66..19c4d66
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msrle32/msrle_Uk.rc
+++ b/dll/win32/msrle32/msrle_Uk.rc

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

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

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

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

diff --cc dll/win32/msvfw32/drawdib.c
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Da.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_De.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_En.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Es.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Fr.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Hu.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_It.rc
index 0000000,6f8ee4e..6f8ee4e
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msvfw32/msvfw32_It.rc
+++ b/dll/win32/msvfw32/msvfw32_It.rc

diff --cc dll/win32/msvfw32/msvfw32_Ko.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Lt.rc
index 0000000,c7432d3..c7432d3
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msvfw32/msvfw32_Lt.rc
+++ b/dll/win32/msvfw32/msvfw32_Lt.rc

diff --cc dll/win32/msvfw32/msvfw32_Nl.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_No.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Pl.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Pt.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Ru.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Si.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Sv.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Tr.rc
Simple merge

diff --cc dll/win32/msvfw32/msvfw32_Uk.rc
index 0000000,c9b1b67..c9b1b67
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msvfw32/msvfw32_Uk.rc
+++ b/dll/win32/msvfw32/msvfw32_Uk.rc

diff --cc dll/win32/msvfw32/msvfw32_Zh.rc
Simple merge

diff --cc dll/win32/msvfw32/msvideo_main.c
Simple merge

diff --cc dll/win32/msvfw32/msvideo_private.h
Simple merge

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

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

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

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

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

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

diff --cc dll/win32/msvidc32/msvidc32_Ja.rc
index 0000000,3d09c76..3d09c76
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msvidc32/msvidc32_Ja.rc
+++ b/dll/win32/msvidc32/msvidc32_Ja.rc

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

diff --cc dll/win32/msvidc32/msvidc32_Lt.rc
index 0000000,ee75ead..ee75ead
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msvidc32/msvidc32_Lt.rc
+++ b/dll/win32/msvidc32/msvidc32_Lt.rc

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

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

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

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

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

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

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

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

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

diff --cc dll/win32/msvidc32/msvidc32_Uk.rc
index 0000000,4a4ea72..4a4ea72
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msvidc32/msvidc32_Uk.rc
+++ b/dll/win32/msvidc32/msvidc32_Uk.rc

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

diff --cc dll/win32/msvidc32/msvideo1.c
Simple merge

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

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

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

diff --cc dll/win32/ole32/compobj.c
Simple merge

diff --cc dll/win32/ole32/compobj_private.h
Simple merge

diff --cc dll/win32/ole32/compositemoniker.c
Simple merge

diff --cc dll/win32/ole32/datacache.c
Simple merge

diff --cc dll/win32/ole32/defaulthandler.c
Simple merge

diff --cc dll/win32/ole32/errorinfo.c
Simple merge

diff --cc dll/win32/ole32/filemoniker.c
Simple merge

diff --cc dll/win32/ole32/hglobalstream.c
Simple merge

diff --cc dll/win32/ole32/itemmoniker.c
Simple merge

diff --cc dll/win32/ole32/marshal.c
Simple merge

diff --cc dll/win32/ole32/moniker.c
Simple merge

diff --cc dll/win32/ole32/ole2.c
Simple merge

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

diff --cc dll/win32/ole32/ole32res.rc
Simple merge

diff --cc dll/win32/ole32/oleproxy.c
Simple merge

diff --cc dll/win32/ole32/regsvr.c
Simple merge

diff --cc dll/win32/ole32/rpc.c
Simple merge

diff --cc dll/win32/ole32/stg_prop.c
Simple merge

diff --cc dll/win32/ole32/stg_stream.c
Simple merge

diff --cc dll/win32/ole32/storage32.c
Simple merge

diff --cc dll/win32/ole32/storage32.h
Simple merge

diff --cc dll/win32/ole32/stubmanager.c
Simple merge

diff --cc dll/win32/ole32/usrmarshal.c
Simple merge

diff --cc dll/win32/oleaut32/dispatch.c
Simple merge

diff --cc dll/win32/oleaut32/oleaut.c
Simple merge

diff --cc dll/win32/oleaut32/oleaut32.rbuild
Simple merge

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

diff --cc dll/win32/oleaut32/oleaut32_Bg.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Cz.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Da.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_De.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_El.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_En.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Eo.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Es.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Fr.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Hu.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_It.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Ko.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Lt.rc
index 0000000,c568d93..c568d93
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/oleaut32/oleaut32_Lt.rc
+++ b/dll/win32/oleaut32/oleaut32_Lt.rc

diff --cc dll/win32/oleaut32/oleaut32_Nl.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_No.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Pl.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Pt.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Ro.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Ru.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Si.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Sv.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Th.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Tr.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Uk.rc
Simple merge

diff --cc dll/win32/oleaut32/oleaut32_Zh.rc
Simple merge

diff --cc dll/win32/oleaut32/olefont.c
Simple merge

diff --cc dll/win32/oleaut32/olepicture.c
Simple merge

diff --cc dll/win32/oleaut32/regsvr.c
Simple merge

diff --cc dll/win32/oleaut32/tmarshal.c
Simple merge

diff --cc dll/win32/oleaut32/typelib.c
Simple merge

diff --cc dll/win32/oleaut32/typelib.h
Simple merge

diff --cc dll/win32/oleaut32/typelib2.c
Simple merge

diff --cc dll/win32/oleaut32/usrmarshal.c
Simple merge

diff --cc dll/win32/oleaut32/varformat.c
Simple merge

diff --cc dll/win32/oleaut32/variant.c
Simple merge

diff --cc dll/win32/oleaut32/variant.h
Simple merge

diff --cc dll/win32/oleaut32/vartype.c
Simple merge

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

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

diff --cc dll/win32/shell32/shellord.c
Simple merge

diff --cc dll/win32/shell32/shlfileop.c
Simple merge

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

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

diff --cc dll/win32/user32/include/user32p.h
Simple merge

diff --cc dll/win32/user32/windows/input.c
Simple merge

diff --cc dll/win32/user32/windows/message.c
Simple merge

diff --cc dll/win32/user32/windows/spy.c
Simple merge

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

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

diff --cc dll/win32/wldap32/wldap32_Da.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_De.rc
Simple merge

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

diff --cc dll/win32/wldap32/wldap32_Es.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Fr.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Ko.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Lt.rc
index 0000000,41a8f59..41a8f59
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/wldap32/wldap32_Lt.rc
+++ b/dll/win32/wldap32/wldap32_Lt.rc

diff --cc dll/win32/wldap32/wldap32_Nl.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_No.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Pl.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Pt.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Ru.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Sv.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Tr.rc
Simple merge

diff --cc dll/win32/wldap32/wldap32_Uk.rc
index 0000000,54fe943..54fe943
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/wldap32/wldap32_Uk.rc
+++ b/dll/win32/wldap32/wldap32_Uk.rc

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

diff --cc dll/win32/wuapi/regsvr.c
Simple merge

diff --cc dll/win32/xinput1_3/xinput1_3_main.c
Simple merge

diff --cc drivers/bus/acpi/busmgr/bus.c
Simple merge

diff --cc drivers/bus/acpi/buspdo.c
Simple merge

diff --cc drivers/bus/acpi/include/acpi_bus.h
Simple merge

diff --cc drivers/bus/acpi/include/acpisys.h
Simple merge

diff --cc drivers/bus/acpi/include/glue.h
Simple merge

diff --cc drivers/storage/ide/atapi/atapi.rbuild
Simple merge

diff --cc drivers/storage/port/buslogic/BusLogic958.c
Simple merge

diff --cc drivers/storage/port/buslogic/buslogic.rbuild
Simple merge

diff --cc drivers/video/displays/framebuf_new/framebuf_new.rbuild
Simple merge

diff --cc drivers/video/displays/framebuf_new/screen.c
Simple merge

diff --cc drivers/video/miniport/vga_new/modeset.c
Simple merge

diff --cc drivers/video/miniport/vga_new/vga.c
Simple merge

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

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

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

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

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

diff --cc include/reactos/subsys/csrss/csrss.h
Simple merge

diff --cc include/reactos/win32k/ntuser.h
Simple merge

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

diff --cc media/inf/battery.inf
index 9ac8d89,33a8fb8..33a8fb8
Binary files differ

diff --cc media/inf/inf.rbuild
Simple merge

diff --cc media/inf/syssetup.inf.tpl
Simple merge

diff --cc ntoskrnl/po/poshtdwn.c
Simple merge

diff --cc ntoskrnl/po/povolume.c
Simple merge

diff --cc ntoskrnl/ps/security.c
Simple merge

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

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

diff --cc subsystems/csr/csrsrv/process.c
Simple merge

diff --cc subsystems/csr/csrsrv/thread.c
Simple merge

diff --cc subsystems/win32/csrss/csrsrv/api/handle.c
Simple merge

diff --cc subsystems/win32/csrss/csrsrv/api/process.c
Simple merge

diff --cc subsystems/win32/csrss/csrsrv/api/user.c
Simple merge

diff --cc subsystems/win32/csrss/csrsrv/api/wapi.c
Simple merge

diff --cc subsystems/win32/csrss/csrsrv/csrsrv.rbuild
index 0000000,3f00210..3f00210
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild
+++ b/subsystems/win32/csrss/csrsrv/csrsrv.rbuild

diff --cc subsystems/win32/csrss/csrsrv/csrsrv.rc
index 0000000,658072d..658072d
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/subsystems/csr/csrsrv/csrsrv.rc
+++ b/subsystems/win32/csrss/csrsrv/csrsrv.rc

diff --cc subsystems/win32/csrss/csrsrv/csrsrv.spec
index 0000000,d3e7b64..d3e7b64
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec
+++ b/subsystems/win32/csrss/csrsrv/csrsrv.spec

diff --cc subsystems/win32/csrss/csrsrv/init.c
Simple merge

diff --cc subsystems/win32/csrss/csrsrv/procsup.c
index 0000000,d139d97..d139d97
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/subsystems/win32/csrss/csrsrv/procsup.c
+++ b/subsystems/win32/csrss/csrsrv/procsup.c

diff --cc subsystems/win32/csrss/csrsrv/srv.h
Simple merge

diff --cc subsystems/win32/csrss/csrsrv/thredsup.c
index 0000000,e893888..e893888
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/subsystems/win32/csrss/csrsrv/thredsup.c
+++ b/subsystems/win32/csrss/csrsrv/thredsup.c

diff --cc subsystems/win32/csrss/csrss.c
Simple merge

diff --cc subsystems/win32/csrss/csrss.rbuild
Simple merge

diff --cc subsystems/win32/csrss/include/api.h
Simple merge

diff --cc subsystems/win32/win32k/eng/surface.c
Simple merge

diff --cc subsystems/win32/win32k/ntuser/ntstubs.c
Simple merge

diff --cc subsystems/win32/win32k/objects/device.c
Simple merge