[ros-diffs] [tkreuzer] 50505: [CMAKE] - Sync with trunk 50501 - fix a couple of merge artifacts (indentation)

Author: tkreuzer
Date: Wed Jan 26 23:24:08 2011
New Revision: 50505

URL: http://svn.reactos.org/svn/reactos?rev=50505&view=rev
Log:
[CMAKE]
- Sync with trunk 50501
- fix a couple of merge artifacts (indentation)

Added:
    branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc   (with props)
Modified:
    branches/cmake-bringup/   (props changed)
    branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt
    branches/cmake-bringup/base/applications/network/ping/ping.c
    branches/cmake-bringup/base/applications/network/ping/ping.rc
    branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
    branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/avifil32/rsrc.rc
    branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt
    branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt
    branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c
    branches/cmake-bringup/dll/win32/user32/controls/icontitle.c
    branches/cmake-bringup/dll/win32/user32/windows/class.c
    branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c
    branches/cmake-bringup/drivers/usb/usbehci/fdo.c
    branches/cmake-bringup/drivers/usb/usbehci/irp.c
    branches/cmake-bringup/drivers/usb/usbehci/transfer.c
    branches/cmake-bringup/drivers/usb/usbehci/usbehci.h
    branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c
    branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/   (props changed)
    branches/cmake-bringup/include/crt/math.h
    branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt
    branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt
    branches/cmake-bringup/lib/sdk/crt/misc/i10output.c
    branches/cmake-bringup/lib/sdk/crt/printf/streamout.c
    branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h
    branches/cmake-bringup/ntoskrnl/mm/ARM3/syspte.c
    branches/cmake-bringup/ntoskrnl/se/priv.c
    branches/cmake-bringup/subsystems/win32/win32k/include/tags.h
    branches/cmake-bringup/subsystems/win32/win32k/include/xformobj.h
    branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/arc.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/bitmaps.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/dibobj.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/drawing.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/font.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/metafile.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/path.c
    branches/cmake-bringup/subsystems/win32/win32k/objects/xformobj.c
    branches/cmake-bringup/subsystems/win32/win32k/pch.h

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…

Modified: branches/cmake-bringup/base/applications/network/ping/ping.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…

Modified: branches/cmake-bringup/base/applications/network/ping/ping.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…

Modified: branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dsoun…

Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…

Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3…

Added: branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3…

Modified: branches/cmake-bringup/dll/win32/avifil32/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3…

Modified: branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdiplus…

Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript…

Modified: branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap…

Modified: branches/cmake-bringup/dll/win32/user32/controls/icontitle.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/…

Modified: branches/cmake-bringup/dll/win32/user32/windows/class.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/…

Modified: branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/…

Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh…

Modified: branches/cmake-bringup/drivers/usb/usbehci/irp.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh…

Modified: branches/cmake-bringup/drivers/usb/usbehci/transfer.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh…

Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh…

Modified: branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh…

Modified: branches/cmake-bringup/include/crt/math.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/math.…

Modified: branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libs…

Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake…

Modified: branches/cmake-bringup/lib/sdk/crt/misc/i10output.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/…

Modified: branches/cmake-bringup/lib/sdk/crt/printf/streamout.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/print…

Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/…

Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/syspte.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/…

Modified: branches/cmake-bringup/ntoskrnl/se/priv.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/se/priv.…

Modified: branches/cmake-bringup/subsystems/win32/win32k/include/tags.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/include/xformobj.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/arc.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/bitmaps.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dibobj.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/drawing.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/font.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/metafile.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/path.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/xformobj.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

Modified: branches/cmake-bringup/subsystems/win32/win32k/pch.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…