[CMAKE]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Wed, 26 Jan 2011 23:24:08 +0000 (23:24 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Wed, 26 Jan 2011 23:24:08 +0000 (23:24 +0000)
commit8191f9539659c742e47387e40f241be16d079a4c
treea141d205249aaf5e5bc7098a0761fbf1cb7c4a1b
parente2b7eacdd5678fcce615469f8c0ca90bd3e87f27
[CMAKE]
- Sync with trunk 50501
- fix a couple of merge artifacts (indentation)

svn path=/branches/cmake-bringup/; revision=50505
40 files changed:
base/applications/network/ping/CMakeLists.txt
base/applications/network/ping/ping.c
base/applications/network/ping/ping.rc
dll/directx/dsound/CMakeLists.txt
dll/directx/wine/wined3d/CMakeLists.txt
dll/win32/avifil32/CMakeLists.txt
dll/win32/avifil32/rsrc-utf8.rc [new file with mode: 0644]
dll/win32/avifil32/rsrc.rc
dll/win32/gdiplus/CMakeLists.txt
dll/win32/jscript/CMakeLists.txt
dll/win32/setupapi/cfgmgr.c
dll/win32/user32/controls/icontitle.c
dll/win32/user32/windows/class.c
dll/win32/user32/windows/cursoricon.c
drivers/usb/usbehci/fdo.c
drivers/usb/usbehci/irp.c
drivers/usb/usbehci/transfer.c
drivers/usb/usbehci/usbehci.h
drivers/usb/usbehci/usbiffn.c
include/crt/math.h
lib/3rdparty/libsamplerate/CMakeLists.txt
lib/sdk/crt/CMakeLists.txt
lib/sdk/crt/misc/i10output.c
lib/sdk/crt/printf/streamout.c
ntoskrnl/include/internal/i386/mm.h
ntoskrnl/mm/ARM3/syspte.c
ntoskrnl/se/priv.c
subsystems/win32/win32k/include/tags.h
subsystems/win32/win32k/include/xformobj.h
subsystems/win32/win32k/ntuser/window.c
subsystems/win32/win32k/objects/arc.c
subsystems/win32/win32k/objects/bitmaps.c
subsystems/win32/win32k/objects/coord.c
subsystems/win32/win32k/objects/dibobj.c
subsystems/win32/win32k/objects/drawing.c
subsystems/win32/win32k/objects/font.c
subsystems/win32/win32k/objects/metafile.c
subsystems/win32/win32k/objects/path.c
subsystems/win32/win32k/objects/xformobj.c
subsystems/win32/win32k/pch.h