Synchronize with trunk's revision r57599.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 23 Oct 2012 19:54:03 +0000 (19:54 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 23 Oct 2012 19:54:03 +0000 (19:54 +0000)
svn path=/branches/ros-csrss/; revision=57600

36 files changed:
1  2 
boot/bootdata/hivesys_amd64.inf
boot/bootdata/hivesys_arm.inf
boot/bootdata/hivesys_i386.inf
dll/win32/lsasrv/CMakeLists.txt
dll/win32/lsasrv/lookup.c
dll/win32/lsasrv/lsasrv.h
dll/win32/samlib/samlib.c
dll/win32/samlib/samlib.spec
dll/win32/shell32/iconcache.cpp
drivers/hid/hidparse/hidparse.c
drivers/hid/mouhid/mouhid.c
drivers/hid/mouhid/mouhid.h
drivers/usb/usbd/usbd.c
drivers/usb/usbhub/fdo.c
drivers/usb/usbhub/pdo.c
drivers/usb/usbhub/usbhub.h
drivers/usb/usbstor/fdo.c
drivers/usb/usbstor/pdo.c
drivers/usb/usbstor/usbstor.h
include/ddk/ntsam.h
include/reactos/idl/sam.idl
include/reactos/wine/unicode.h
lib/drivers/hidparser/api.c
lib/drivers/hidparser/hidparser.c
lib/drivers/hidparser/hidparser.h
lib/drivers/hidparser/parser.h
ntoskrnl/include/internal/po.h
ntoskrnl/io/iomgr/device.c
ntoskrnl/po/povolume.c
win32ss/gdi/eng/engbrush.c
win32ss/gdi/eng/xlateobj.c
win32ss/gdi/ntgdi/bitblt.c
win32ss/gdi/ntgdi/brush.h
win32ss/gdi/ntgdi/dclife.c
win32ss/gdi/ntgdi/dcobjs.c
win32ss/user/ntuser/cursoricon.c

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
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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge