Synchronize with trunk revision 59781.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Mon, 19 Aug 2013 18:55:28 +0000 (18:55 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Mon, 19 Aug 2013 18:55:28 +0000 (18:55 +0000)
svn path=/branches/ntvdm/; revision=59784

80 files changed:
1  2 
base/setup/usetup/bootsup.c
base/system/services/database.c
boot/bootdata/hivesys.inf
boot/freeldr/freeldr/comm/rs232.c
boot/freeldr/freeldr/windows/headless.c
boot/freeldr/freeldr/windows/winldr.c
cmake/gcc.cmake
dll/ntdll/csr/connect.c
dll/opengl/glu32/CMakeLists.txt
dll/opengl/glu32/glu32.rc
dll/win32/kernel32/client/console/init.c
dll/win32/kernel32/client/dosdev.c
dll/win32/kernel32/client/file/filename.c
dll/win32/kernel32/client/job.c
dll/win32/kernel32/client/proc.c
dll/win32/kernel32/client/vdm.c
dll/win32/kernel32/k32.h
dll/win32/netapi32/user.c
dll/win32/samlib/samlib.c
dll/win32/samsrv/samrpc.c
dll/win32/samsrv/user.c
drivers/base/kdcom/kdcom.c
drivers/sac/driver/chanmgr.c
drivers/sac/driver/channel.c
drivers/sac/driver/concmd.c
drivers/sac/driver/conmgr.c
drivers/sac/driver/data.c
drivers/sac/driver/dispatch.c
drivers/sac/driver/memory.c
drivers/sac/driver/rawchan.c
drivers/sac/driver/sacdrv.h
drivers/sac/driver/util.c
drivers/sac/driver/vtutf8chan.c
include/crt/mbstring.h
include/crt/sec_api/conio_s.h
include/crt/sec_api/mbstring_s.h
include/crt/sec_api/string_s.h
include/psdk/cfgmgr32.h
include/psdk/commctrl.h
include/psdk/dbghelp.h
include/psdk/ks.h
include/psdk/msi.h
include/psdk/objbase.h
include/psdk/oleauto.h
include/psdk/oledlg.h
include/psdk/sal.h
include/psdk/shellapi.h
include/psdk/shlobj.h
include/psdk/shlwapi.h
include/psdk/shlwapi_undoc.h
include/psdk/wincon.h
include/psdk/winsock.h
include/psdk/ws2spi.h
include/psdk/ws2tcpip.h
include/reactos/libs/cportlib/cportlib.h
include/reactos/mc/CMakeLists.txt
include/reactos/mc/sacmsg.mc
include/reactos/subsys/csr/csrmsg.h
include/reactos/subsys/win/basemsg.h
include/reactos/subsys/win/conmsg.h
lib/cportlib/cport.c
lib/rtl/process.c
ntoskrnl/ex/hdlsterm.c
ntoskrnl/inbv/inbvport.c
ntoskrnl/include/internal/hdl.h
ntoskrnl/include/internal/inbv.h
ntoskrnl/kd/i386/kdbg.c
ntoskrnl/rtl/misc.c
subsystems/win/basesrv/dosdev.c
subsystems/win/basesrv/proc.c
subsystems/win/basesrv/vdm.c
subsystems/win32/csrsrv/api.c
subsystems/win32/csrsrv/api.h
subsystems/win32/csrsrv/server.c
win32ss/gdi/ntgdi/freetype.c
win32ss/user/ntuser/desktop.h
win32ss/user/ntuser/main.c
win32ss/user/ntuser/ntuser.h
win32ss/user/ntuser/usrheap.c
win32ss/user/winsrv/consrv/init.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cmake/gcc.cmake
Simple merge
Simple merge
Simple merge
index 0000000,6c183eb..6c183eb
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,d698f4a..d698f4a
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge