Merge trunk r45185
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 21 Jan 2010 18:34:48 +0000 (18:34 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 21 Jan 2010 18:34:48 +0000 (18:34 +0000)
commit5f457606f360c964d307eb3f9a668cca716e1918
tree7c55f45af987d51292be58632a4301be2948933d
parentb9ebd4c107c195bc5a397faad78696e62c88408b
parent051cf08911ff04d32457a3f6c8ac1cf8f1c173d6
Merge trunk r45185

svn path=/branches/ros-amd64-bringup/; revision=45186
31 files changed:
reactos/dll/win32/iphlpapi/iphlpapi_private.h
reactos/dll/win32/user32/include/user32p.h
reactos/dll/win32/user32/misc/misc.c
reactos/drivers/network/afd/afd/lock.c
reactos/drivers/network/afd/afd/main.c
reactos/drivers/network/dd/pcnet/pcnet.c
reactos/drivers/network/tcpip/datalink/lan.c
reactos/drivers/network/tcpip/tcpip.rbuild
reactos/drivers/network/tcpip/tcpip/dispatch.c
reactos/hal/halx86/hal_generic.rbuild
reactos/hal/halx86/hal_generic_up.rbuild
reactos/hal/halx86/include/halp.h
reactos/hal/halx86/mp/apic.c
reactos/hal/halx86/mp/i386/mps.S
reactos/hal/halx86/mp/i386/mpsboot.asm
reactos/hal/halx86/mp/mpsirql.c
reactos/hal/halx86/up/irq.S
reactos/include/psdk/winuser.h
reactos/include/reactos/win32k/ntuser.h
reactos/lib/drivers/ip/transport/tcp/tcp.c
reactos/lib/tdilib/tdilib.rbuild
reactos/ntoskrnl/include/internal/ke.h
reactos/ntoskrnl/include/internal/ke_x.h
reactos/ntoskrnl/ke/freeldr.c
reactos/ntoskrnl/ke/i386/cpu.c
reactos/ntoskrnl/ke/i386/ctxswitch.S
reactos/ntoskrnl/mm/ARM3/contmem.c
reactos/ntoskrnl/ntoskrnl-generic.rbuild
reactos/subsystems/win32/win32k/ntuser/message.c
reactos/subsystems/win32/win32k/objects/gdiobj.c
reactos/tools/rbuild/module.cpp