[jjones] 59329: Merge with trunk.

Author: jjones
Date: Mon Jun 24 04:01:33 2013
New Revision: 59329

URL: http://svn.reactos.org/svn/reactos?rev=59329&view=rev
Log:
Merge with trunk.

Added:
    branches/vs_jc/reactos/dll/directx/dxgi/
      - copied from r59328, trunk/reactos/dll/directx/dxgi/
    branches/vs_jc/reactos/dll/win32/mshtml/msvc.S
      - copied unchanged from r59328, trunk/reactos/dll/win32/mshtml/msvc.S
    branches/vs_jc/reactos/dll/win32/samsrv/security.c
      - copied unchanged from r59328, trunk/reactos/dll/win32/samsrv/security.c
    branches/vs_jc/reactos/dll/win32/wbemprox/
      - copied from r59328, trunk/reactos/dll/win32/wbemprox/
    branches/vs_jc/reactos/include/psdk/d3d10.idl
      - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10.idl
    branches/vs_jc/reactos/include/psdk/d3d10effect.h
      - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10effect.h
    branches/vs_jc/reactos/include/psdk/d3d10misc.h
      - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10misc.h
    branches/vs_jc/reactos/include/psdk/d3d10shader.h
      - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10shader.h
    branches/vs_jc/reactos/include/psdk/d3dcommon.idl
      - copied unchanged from r59328, trunk/reactos/include/psdk/d3dcommon.idl
    branches/vs_jc/reactos/include/psdk/dxgi.idl
      - copied unchanged from r59328, trunk/reactos/include/psdk/dxgi.idl
    branches/vs_jc/reactos/include/psdk/dxgiformat.h
      - copied unchanged from r59328, trunk/reactos/include/psdk/dxgiformat.h
    branches/vs_jc/reactos/include/psdk/dxgitype.h
      - copied unchanged from r59328, trunk/reactos/include/psdk/dxgitype.h
    branches/vs_jc/reactos/include/psdk/wbemprov.idl
      - copied unchanged from r59328, trunk/reactos/include/psdk/wbemprov.idl
    branches/vs_jc/reactos/include/reactos/wine/winedxgi.idl
      - copied unchanged from r59328, trunk/reactos/include/reactos/wine/winedxgi.idl
    branches/vs_jc/reactos/win32ss/user/consrv/condrv/coninput.c
      - copied unchanged from r59328, trunk/reactos/win32ss/user/consrv/condrv/coninput.c
    branches/vs_jc/reactos/win32ss/user/consrv/condrv/conoutput.c
      - copied unchanged from r59328, trunk/reactos/win32ss/user/consrv/condrv/conoutput.c
    branches/vs_jc/reactos/win32ss/user/consrv/condrv/text.c
      - copied unchanged from r59328, trunk/reactos/win32ss/user/consrv/condrv/text.c
Removed:
    branches/vs_jc/reactos/win32ss/user/consrv/text.c
Modified:
    branches/vs_jc/reactos/   (props changed)
    branches/vs_jc/reactos/boot/bootdata/packages/reactos.dff.in
    branches/vs_jc/reactos/cmake/CMakeMacros.cmake
    branches/vs_jc/reactos/dll/directx/CMakeLists.txt
    branches/vs_jc/reactos/dll/win32/CMakeLists.txt
    branches/vs_jc/reactos/dll/win32/mshtml/CMakeLists.txt
    branches/vs_jc/reactos/dll/win32/mshtml/ifacewrap.c
    branches/vs_jc/reactos/dll/win32/samsrv/CMakeLists.txt
    branches/vs_jc/reactos/dll/win32/samsrv/database.c
    branches/vs_jc/reactos/dll/win32/samsrv/samsrv.c
    branches/vs_jc/reactos/dll/win32/samsrv/samsrv.h
    branches/vs_jc/reactos/dll/win32/samsrv/samsrv.spec
    branches/vs_jc/reactos/dll/win32/samsrv/setup.c
    branches/vs_jc/reactos/include/psdk/CMakeLists.txt
    branches/vs_jc/reactos/include/psdk/ipifcons.h
    branches/vs_jc/reactos/include/psdk/iptypes.h
    branches/vs_jc/reactos/include/psdk/wbemcli.idl
    branches/vs_jc/reactos/include/psdk/winternl.h
    branches/vs_jc/reactos/include/reactos/wine/CMakeLists.txt
    branches/vs_jc/reactos/media/doc/README.WINE
    branches/vs_jc/reactos/media/inf/syssetup.inf
    branches/vs_jc/reactos/ntoskrnl/se/token.c
    branches/vs_jc/reactos/tools/widl/header.c
    branches/vs_jc/reactos/win32ss/user/consrv/CMakeLists.txt
    branches/vs_jc/reactos/win32ss/user/consrv/condrv/console.c
    branches/vs_jc/reactos/win32ss/user/consrv/coninput.c
    branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c
    branches/vs_jc/reactos/win32ss/user/consrv/conoutput.h
    branches/vs_jc/reactos/win32ss/user/consrv/console.c

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

Modified: branches/vs_jc/reactos/boot/bootdata/packages/reactos.dff.in
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/bootdata/pack...

Modified: branches/vs_jc/reactos/cmake/CMakeMacros.cmake
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/cmake/CMakeMacros....

Modified: branches/vs_jc/reactos/dll/directx/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/directx/CMakeL...

Modified: branches/vs_jc/reactos/dll/win32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/CMakeLis...

Modified: branches/vs_jc/reactos/dll/win32/mshtml/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/mshtml/C...

Modified: branches/vs_jc/reactos/dll/win32/mshtml/ifacewrap.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/mshtml/i...

Modified: branches/vs_jc/reactos/dll/win32/samsrv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/C...

Modified: branches/vs_jc/reactos/dll/win32/samsrv/database.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/d...

Modified: branches/vs_jc/reactos/dll/win32/samsrv/samsrv.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/s...

Modified: branches/vs_jc/reactos/dll/win32/samsrv/samsrv.h
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/s...

Modified: branches/vs_jc/reactos/dll/win32/samsrv/samsrv.spec
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/s...

Modified: branches/vs_jc/reactos/dll/win32/samsrv/setup.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/s...

Modified: branches/vs_jc/reactos/include/psdk/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/CMake...

Modified: branches/vs_jc/reactos/include/psdk/ipifcons.h
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/ipifc...

Modified: branches/vs_jc/reactos/include/psdk/iptypes.h
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/iptyp...

Modified: branches/vs_jc/reactos/include/psdk/wbemcli.idl
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/wbemc...

Modified: branches/vs_jc/reactos/include/psdk/winternl.h
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/winte...

Modified: branches/vs_jc/reactos/include/reactos/wine/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/wi...

Modified: branches/vs_jc/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/media/doc/README.W...

Modified: branches/vs_jc/reactos/media/inf/syssetup.inf
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/media/inf/syssetup...

Modified: branches/vs_jc/reactos/ntoskrnl/se/token.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/se/token....

Modified: branches/vs_jc/reactos/tools/widl/header.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/widl/header....

Modified: branches/vs_jc/reactos/win32ss/user/consrv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/consr...

Modified: branches/vs_jc/reactos/win32ss/user/consrv/condrv/console.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/consr...

Modified: branches/vs_jc/reactos/win32ss/user/consrv/coninput.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/consr...

Modified: branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/consr...

Modified: branches/vs_jc/reactos/win32ss/user/consrv/conoutput.h
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/consr...

Modified: branches/vs_jc/reactos/win32ss/user/consrv/console.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/consr...

Removed: branches/vs_jc/reactos/win32ss/user/consrv/text.c
URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/consr...