Merge trunk HEAD (r46369)
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Wed, 24 Mar 2010 00:03:54 +0000 (00:03 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Wed, 24 Mar 2010 00:03:54 +0000 (00:03 +0000)
commit9df4519b799e420004f50676ca1a5aa546ef307e
treec20a42d0906ea9a245f2724abce84599f18b5b3a
parentaf2f84a5ea379f0e7fbc621e1f743b7c158cbea1
parentfc1acf8469e3a6b6e4b5528eb4dfa8f12b55c1d0
Merge trunk HEAD (r46369)
(part 6/6)

svn path=/branches/ros-amd64-bringup/; revision=46380
90 files changed:
reactos/Makefile
reactos/ReactOS-i386.rbuild
reactos/base/setup/usetup/inffile.h
reactos/base/setup/usetup/usetup.h
reactos/boot/freeldr/freeldr/debug.c
reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
reactos/boot/freeldr/freeldr/windows/peloader.c
reactos/boot/freeldr/freeldr/windows/winldr.c
reactos/dll/ntdll/ldr/utils.c
reactos/drivers/base/bootvid/i386/bootvid.c
reactos/drivers/base/kdcom/i386/kdbg.c
reactos/drivers/bus/acpi/acpi.rbuild
reactos/drivers/bus/acpi/acpi.rc
reactos/drivers/network/dd/ne2000/include/ne2000.h
reactos/drivers/storage/floppy/floppy.c
reactos/drivers/storage/ide/uniata/id_ata.cpp
reactos/drivers/storage/ide/uniata/id_probe.cpp
reactos/drivers/video/videoprt/int10.c
reactos/drivers/video/videoprt/videoprt.c
reactos/drivers/video/videoprt/videoprt.spec
reactos/drivers/wdm/audio/legacy/wdmaud/control.c
reactos/drivers/wdm/audio/legacy/wdmaud/entry.c
reactos/drivers/wdm/audio/legacy/wdmaud/interface.h
reactos/hal/halx86/generic/misc.c
reactos/hal/halx86/generic/timer.c
reactos/hal/halx86/hal_generic.rbuild
reactos/hal/halx86/hal_generic_mp.rbuild
reactos/hal/halx86/hal_generic_up.rbuild
reactos/hal/halx86/halmps.rbuild
reactos/hal/halx86/include/hal.h
reactos/hal/halx86/include/halp.h
reactos/hal/halx86/mp/apic.c
reactos/include/crt/_mingw.h
reactos/include/crt/math.h
reactos/include/crt/setjmp.h
reactos/include/crt/stdio.h
reactos/include/crt/tchar.h
reactos/include/crt/time.h
reactos/include/crt/vadefs.h
reactos/include/crt/wchar.h
reactos/include/ddk/wdm.h
reactos/include/ndk/i386/ketypes.h
reactos/include/ndk/rtlfuncs.h
reactos/include/psdk/windef.h
reactos/include/psdk/wingdi.h
reactos/include/psdk/winnt.h
reactos/include/psdk/winuser.h
reactos/include/reactos/win32k/ntuser.h
reactos/lib/inflib/infpriv.h
reactos/lib/inflib/infros.h
reactos/lib/rtl/actctx.c
reactos/lib/sdk/crt/crt.rbuild
reactos/lib/sdk/crt/libcntpr.rbuild
reactos/lib/sdk/crt/stdio/file.c
reactos/lib/tdilib/tdilib.rbuild
reactos/ntoskrnl/include/internal/arch/intrin_i.h
reactos/ntoskrnl/include/internal/arch/ke.h
reactos/ntoskrnl/include/internal/arch/mm.h
reactos/ntoskrnl/include/internal/arm/mm.h
reactos/ntoskrnl/include/internal/i386/mm.h
reactos/ntoskrnl/include/internal/ke.h
reactos/ntoskrnl/include/internal/mm.h
reactos/ntoskrnl/include/internal/ntoskrnl.h
reactos/ntoskrnl/io/iomgr/irp.c
reactos/ntoskrnl/kdbg/kdb.h
reactos/ntoskrnl/ke/except.c
reactos/ntoskrnl/ke/i386/cpu.c
reactos/ntoskrnl/mm/ARM3/hypermap.c
reactos/ntoskrnl/mm/ARM3/iosup.c
reactos/ntoskrnl/mm/ARM3/mdlsup.c
reactos/ntoskrnl/mm/ARM3/miarm.h
reactos/ntoskrnl/mm/ARM3/mmsup.c
reactos/ntoskrnl/mm/ARM3/ncache.c
reactos/ntoskrnl/mm/ARM3/pagfault.c
reactos/ntoskrnl/mm/ARM3/procsup.c
reactos/ntoskrnl/mm/anonmem.c
reactos/ntoskrnl/mm/balance.c
reactos/ntoskrnl/mm/freelist.c
reactos/ntoskrnl/mm/i386/page.c
reactos/ntoskrnl/mm/mmdbg.c
reactos/ntoskrnl/mm/mmfault.c
reactos/ntoskrnl/mm/mminit.c
reactos/ntoskrnl/mm/rmap.c
reactos/ntoskrnl/mm/section.c
reactos/ntoskrnl/mm/sysldr.c
reactos/ntoskrnl/ntoskrnl-generic.rbuild
reactos/ntoskrnl/ntoskrnl.pspec
reactos/subsystems/win32/win32k/include/msgqueue.h
reactos/subsystems/win32/win32k/ntuser/message.c
reactos/tools/rsym/rsym64.h