Sunc with trunk revision 58971.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Thu, 9 May 2013 12:36:15 +0000 (12:36 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Thu, 9 May 2013 12:36:15 +0000 (12:36 +0000)
svn path=/branches/kd++/; revision=58972

208 files changed:
1  2 
base/applications/cmdutils/hostname/CMakeLists.txt
base/applications/cmdutils/hostname/hostname.c
base/applications/cmdutils/hostname/hostname.rc
base/applications/cmdutils/hostname/lang/cs-CZ.rc
base/applications/cmdutils/hostname/lang/en-US.rc
base/applications/cmdutils/hostname/lang/fr-FR.rc
base/applications/cmdutils/hostname/lang/pl-PL.rc
base/applications/cmdutils/hostname/resource.h
base/applications/cmdutils/hostname/rsrc.rc
base/applications/cmdutils/reg/lang/cs-CZ.rc
base/applications/cmdutils/reg/rsrc.rc
base/applications/dxdiag/lang/tr-TR.rc
base/applications/kbswitch/lang/tr-TR.rc
base/applications/kbswitch/rsrc.rc
base/applications/mscutils/servman/precomp.h
base/applications/mstsc/precomp.h
base/applications/network/net/CMakeLists.txt
base/applications/network/net/cmdContinue.c
base/applications/network/net/cmdHelpMsg.c
base/applications/network/net/cmdPause.c
base/applications/network/net/help.c
base/applications/network/net/main.c
base/applications/network/net/net.h
base/applications/network/wlanconf/lang/cs-CZ.rc
base/applications/network/wlanconf/wlanconf.rc
base/applications/rapps/rapps.h
base/applications/regedit/lang/cs-CZ.rc
base/applications/regedit/regedit.rc
base/shell/explorer-new/precomp.h
base/shell/explorer/precomp.h
base/system/userinit/userinit.c
boot/bootdata/hivesft.inf
cmake/baseaddress.cmake
dll/cpl/desk/desk.h
dll/cpl/desk/lang/cs-CZ.rc
dll/cpl/main/main.h
dll/cpl/sysdm/precomp.h
dll/ntdll/csr/connect.c
dll/shellext/deskadp/precomp.h
dll/shellext/deskmon/precomp.h
dll/shellext/slayer/precomp.h
dll/win32/advapi32/reg/reg.c
dll/win32/browseui/precomp.h
dll/win32/comdlg32/cdlg.h
dll/win32/comdlg32/filedlgbrowser.h
dll/win32/fusion/CMakeLists.txt
dll/win32/fusion/asmcache.c
dll/win32/fusion/asmenum.c
dll/win32/fusion/asmname.c
dll/win32/fusion/assembly.c
dll/win32/fusion/fusion.c
dll/win32/fusion/fusion.spec
dll/win32/fusion/fusionpriv.h
dll/win32/ieframe/ieframe.h
dll/win32/ieframe/ieframe.rc
dll/win32/kernel32/client/job.c
dll/win32/kernel32/client/time.c
dll/win32/kernel32/client/utils.c
dll/win32/lsasrv/authpackage.c
dll/win32/lsasrv/lsasrv.h
dll/win32/msgina/gui.c
dll/win32/msgina/lang/cs-CZ.rc
dll/win32/msgina/msgina.c
dll/win32/msgina/msgina.h
dll/win32/msgina/stubs.c
dll/win32/msgina/tui.c
dll/win32/msi/package.c
dll/win32/msv1_0/msv1_0.c
dll/win32/msv1_0/msv1_0.h
dll/win32/newdev/newdev_private.h
dll/win32/setupapi/setupapi_private.h
dll/win32/shell32/precomp.h
dll/win32/shlwapi/ordinal.c
dll/win32/syssetup/precomp.h
dll/win32/syssetup/wizard.c
drivers/base/beep/beep.c
drivers/hid/hidclass/hidclass.c
drivers/network/afd/afd/bind.c
drivers/network/afd/afd/connect.c
drivers/network/afd/afd/context.c
drivers/network/afd/afd/info.c
drivers/network/afd/afd/listen.c
drivers/network/afd/afd/lock.c
drivers/network/afd/afd/main.c
drivers/network/afd/afd/read.c
drivers/network/afd/afd/select.c
drivers/network/afd/afd/tdi.c
drivers/network/afd/afd/write.c
drivers/network/afd/include/afd.h
drivers/network/ndis/include/miniport.h
drivers/network/ndis/ndis/miniport.c
drivers/network/ndis/ndis/protocol.c
include/crt/memory.h
include/crt/sys/utime.h
include/crt/tchar.h
include/ddk/ntddk.h
include/ddk/wdm.h
include/psdk/corerror.h
include/psdk/fusion.idl
include/psdk/ntsecpkg.h
include/psdk/shlobj.h
include/psdk/shlobj_undoc.h
include/psdk/winternl.h
include/xdk/iofuncs.h
lib/atl/atlcom.h
lib/atl/statreg.h
lib/drivers/libusb/hcd_controller.cpp
lib/drivers/libusb/hub_controller.cpp
lib/drivers/lwip/CHANGELOG
lib/drivers/lwip/doc/contrib.txt
lib/drivers/lwip/doc/rawapi.txt
lib/drivers/lwip/doc/savannah.txt
lib/drivers/lwip/doc/sys_arch.txt
lib/drivers/lwip/src/api/api_lib.c
lib/drivers/lwip/src/api/api_msg.c
lib/drivers/lwip/src/api/netdb.c
lib/drivers/lwip/src/api/sockets.c
lib/drivers/lwip/src/api/tcpip.c
lib/drivers/lwip/src/core/dhcp.c
lib/drivers/lwip/src/core/init.c
lib/drivers/lwip/src/core/ipv4/autoip.c
lib/drivers/lwip/src/core/ipv4/icmp.c
lib/drivers/lwip/src/core/ipv4/igmp.c
lib/drivers/lwip/src/core/ipv4/ip.c
lib/drivers/lwip/src/core/ipv6/ip6.c
lib/drivers/lwip/src/core/mem.c
lib/drivers/lwip/src/core/memp.c
lib/drivers/lwip/src/core/netif.c
lib/drivers/lwip/src/core/pbuf.c
lib/drivers/lwip/src/core/raw.c
lib/drivers/lwip/src/core/snmp/mib2.c
lib/drivers/lwip/src/core/snmp/msg_in.c
lib/drivers/lwip/src/core/snmp/msg_out.c
lib/drivers/lwip/src/core/stats.c
lib/drivers/lwip/src/core/sys.c
lib/drivers/lwip/src/core/tcp.c
lib/drivers/lwip/src/core/tcp_in.c
lib/drivers/lwip/src/core/tcp_out.c
lib/drivers/lwip/src/core/timers.c
lib/drivers/lwip/src/core/udp.c
lib/drivers/lwip/src/include/arch/cc.h
lib/drivers/lwip/src/include/ipv4/lwip/autoip.h
lib/drivers/lwip/src/include/ipv4/lwip/ip.h
lib/drivers/lwip/src/include/lwip/api.h
lib/drivers/lwip/src/include/lwip/api_msg.h
lib/drivers/lwip/src/include/lwip/arch.h
lib/drivers/lwip/src/include/lwip/debug.h
lib/drivers/lwip/src/include/lwip/def.h
lib/drivers/lwip/src/include/lwip/init.h
lib/drivers/lwip/src/include/lwip/mem.h
lib/drivers/lwip/src/include/lwip/memp_std.h
lib/drivers/lwip/src/include/lwip/netif.h
lib/drivers/lwip/src/include/lwip/opt.h
lib/drivers/lwip/src/include/lwip/pbuf.h
lib/drivers/lwip/src/include/lwip/sockets.h
lib/drivers/lwip/src/include/lwip/stats.h
lib/drivers/lwip/src/include/lwip/sys.h
lib/drivers/lwip/src/include/lwip/tcp.h
lib/drivers/lwip/src/include/lwip/tcp_impl.h
lib/drivers/lwip/src/include/lwip/tcpip.h
lib/drivers/lwip/src/include/lwip/timers.h
lib/drivers/lwip/src/include/lwip/udp.h
lib/drivers/lwip/src/include/netif/etharp.h
lib/drivers/lwip/src/include/netif/slipif.h
lib/drivers/lwip/src/netif/etharp.c
lib/drivers/lwip/src/netif/ethernetif.c
lib/drivers/lwip/src/netif/ppp/auth.c
lib/drivers/lwip/src/netif/ppp/chap.c
lib/drivers/lwip/src/netif/ppp/chpms.c
lib/drivers/lwip/src/netif/ppp/fsm.c
lib/drivers/lwip/src/netif/ppp/ipcp.c
lib/drivers/lwip/src/netif/ppp/lcp.c
lib/drivers/lwip/src/netif/ppp/magic.c
lib/drivers/lwip/src/netif/ppp/md5.c
lib/drivers/lwip/src/netif/ppp/pap.c
lib/drivers/lwip/src/netif/ppp/ppp.c
lib/drivers/lwip/src/netif/ppp/ppp.h
lib/drivers/lwip/src/netif/ppp/ppp_oe.c
lib/drivers/lwip/src/netif/ppp/randm.c
lib/drivers/lwip/src/netif/ppp/vj.c
lib/drivers/lwip/src/netif/slipif.c
lib/drivers/lwip/src/rosip.c
lib/drivers/lwip/src/rosmem.c
lib/drivers/lwip/src/rostcp.c
lib/drivers/lwip/test/unit/lwip_unittests.c
lib/drivers/lwip/test/unit/tcp/tcp_helper.c
lib/drivers/lwip/test/unit/tcp/tcp_helper.h
lib/drivers/lwip/test/unit/tcp/test_tcp.c
lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c
lib/rtl/bitmap.c
lib/rtl/bitmap64.c
lib/rtl/mem.c
lib/rtl/priv.c
media/doc/README.WINE
ntoskrnl/fsrtl/dbcsname.c
ntoskrnl/fsrtl/fsrtlpc.c
ntoskrnl/fsrtl/largemcb.c
ntoskrnl/fsrtl/stackovf.c
ntoskrnl/io/iomgr/error.c
ntoskrnl/ke/i386/v86vdm.c
subsystems/win/basesrv/dosdev.c
subsystems/win32/csrsrv/api.c
subsystems/win32/csrsrv/thredsup.c
win32ss/gdi/ntgdi/device.c
win32ss/gdi/ntgdi/freetype.c
win32ss/user/consrv/console.c
win32ss/user/consrv/init.c
win32ss/user/ntuser/winsta.c

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
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
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,3e572f7..3e572f7
mode 000000,100644..100644
--- /dev/null
diff --cc lib/rtl/mem.c
Simple merge
diff --cc lib/rtl/priv.c
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