Merge trunk head (46467)
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 26 Mar 2010 15:47:53 +0000 (15:47 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 26 Mar 2010 15:47:53 +0000 (15:47 +0000)
commit42f403f39d2111c53bcc3a726b8cdcd73ac6be18
tree73114900d650e09df189f908a9f6438a0e23cc99
parentcb29f7174b56ceaa4a94ba4d926f3177347d2a47
parent7456c01caefb4958cf3ead03719b680cae6fdbfc
parent35093185219d8e5bd1f19105e97445918b6143c7
parentd0701d72b7772d3b3a52109f9594b694127e6e77
Merge trunk head (46467)

svn path=/branches/ros-amd64-bringup/; revision=46468
20 files changed:
reactos/ReactOS-i386.rbuild
reactos/boot/bootdata/bootcd/bootcd.rbuild
reactos/boot/bootdata/livecd/livecd.rbuild
reactos/dll/win32/gdi32/objects/bitmap.c
reactos/dll/win32/kernel32/thread/fiber.c
reactos/drivers/bus/acpi/cmbatt/cmexec.c
reactos/drivers/storage/ide/uniata/bsmaster.h
reactos/drivers/storage/ide/uniata/id_ata.cpp
reactos/hal/hal.rbuild
reactos/hal/halx86/generic/misc.c
reactos/hal/halx86/hal_generic.rbuild
reactos/hal/halx86/hal_generic_up.rbuild
reactos/hal/halx86/include/halp.h
reactos/include/ndk/pstypes.h
reactos/include/psdk/windef.h
reactos/include/psdk/wingdi.h
reactos/include/psdk/winnt.h
reactos/include/psdk/winuser.h
reactos/subsystems/subsystems.rbuild
reactos/tools/rbuild/backend/mingw/compilers/gcc.mak