Sync with trunk head (part 1 of x)
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 26 Mar 2010 09:25:42 +0000 (09:25 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 26 Mar 2010 09:25:42 +0000 (09:25 +0000)
svn path=/branches/header-work/; revision=46461

34 files changed:
1  2 
ReactOS-amd64.rbuild
base/services/tcpsvcs/tcpsvcs.rbuild
base/shell/explorer/explorer.rbuild
boot/bootdata/hiveinst_amd64.inf
config-amd64.template.rbuild
dll/win32/browseui/internettoolbar.cpp
drivers/bus/acpi/busmgr/bus.c
drivers/bus/acpi/main.c
hal/hal.rbuild
hal/halx86/generic/amd64/systimer.S
hal/halx86/generic/amd64/x86bios.c
hal/halx86/generic/cmos.c
hal/halx86/generic/i386/portio.c
hal/halx86/generic/i386/systimer.S
hal/halx86/generic/i386/trap.S
hal/halx86/generic/misc.c
hal/halx86/generic/spinlock.c
hal/halx86/hal_generic.rbuild
hal/halx86/hal_generic_mp.rbuild
hal/halx86/hal_generic_up.rbuild
hal/halx86/halamd64.rbuild
hal/halx86/halmps.rbuild
hal/halx86/include/halp.h
hal/halx86/mp/amd64/mps.S
hal/halx86/mp/i386/mps.S
hal/halx86/mp/i386/mpsboot.asm
hal/halx86/mp/i386/mpsirql.c
hal/halx86/up/pic.c
hal/halx86/up/processor.c
include/dxsdk/bdatif.idl
include/dxsdk/dxsdk.rbuild
ntoskrnl/config/cmalloc.c
ntoskrnl/include/internal/cm_x.h
ntoskrnl/po/events.c

Simple merge
Simple merge
Simple merge
index 0000000,dd7fcdf..dd7fcdf
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
diff --cc hal/hal.rbuild
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,3543652..3543652
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,6c8887e..6c8887e
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge