sync with trunk head (34904)
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 28 Jul 2008 15:52:00 +0000 (15:52 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 28 Jul 2008 15:52:00 +0000 (15:52 +0000)
svn path=/branches/ros-amd64-bringup/; revision=34910

1  2 
reactos/dll/ntdll/def/ntdll_arm.def
reactos/dll/win32/advapi32/advapi32.rbuild
reactos/hal/hal/hal.c
reactos/include/psdk/winnt.h
reactos/lib/sdk/crt/stdio/file.c
reactos/ntoskrnl/mm/anonmem.c
reactos/subsystems/win32/win32k/ntuser/callback.c
reactos/subsystems/win32/win32k/ntuser/hook.c
reactos/tools/rbuild/module.cpp
reactos/tools/winebuild/spec32.c

Simple merge
@@@ -16,8 -15,8 +15,9 @@@
        <library>wine</library>
        <library>kernel32</library>
        <library>pseh</library>
+       <library>ntdll</library>
        <pch>advapi32.h</pch>
 +      <file>advapi32.spec</file>
        <directory name="crypt">
                        <file>crypt.c</file>
                        <file>crypt_arc4.c</file>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge