* Sync with trunk r64401.
authorDavid Quintana <gigaherz@gmail.com>
Mon, 29 Sep 2014 21:34:53 +0000 (21:34 +0000)
committerDavid Quintana <gigaherz@gmail.com>
Mon, 29 Sep 2014 21:34:53 +0000 (21:34 +0000)
svn path=/branches/shell-experiments/; revision=64405

105 files changed:
1  2 
dll/directx/wine/CMakeLists.txt
dll/directx/wine/d3drm/CMakeLists.txt
dll/directx/wine/d3drm/d3drm.c
dll/directx/wine/d3drm/d3drm.spec
dll/directx/wine/d3drm/d3drm_main.c
dll/directx/wine/d3drm/d3drm_private.h
dll/directx/wine/d3drm/device.c
dll/directx/wine/d3drm/face.c
dll/directx/wine/d3drm/frame.c
dll/directx/wine/d3drm/light.c
dll/directx/wine/d3drm/material.c
dll/directx/wine/d3drm/math.c
dll/directx/wine/d3drm/meshbuilder.c
dll/directx/wine/d3drm/texture.c
dll/directx/wine/d3drm/version.rc
dll/directx/wine/d3drm/viewport.c
dll/directx/wine/dsound/CMakeLists.txt
dll/directx/wine/dsound/buffer.c
dll/directx/wine/dsound/capture.c
dll/directx/wine/dsound/dsound.c
dll/directx/wine/dsound/dsound_convert.c
dll/directx/wine/dsound/dsound_main.c
dll/directx/wine/dsound/dsound_private.h
dll/directx/wine/dsound/duplex.c
dll/directx/wine/dsound/guid.c
dll/directx/wine/dsound/mixer.c
dll/directx/wine/dsound/primary.c
dll/directx/wine/dsound/propset.c
dll/directx/wine/dsound/sound3d.c
dll/win32/CMakeLists.txt
dll/win32/localui/lang/ui_Da.rc
dll/win32/localui/lang/ui_De.rc
dll/win32/localui/lang/ui_En.rc
dll/win32/localui/lang/ui_Es.rc
dll/win32/localui/lang/ui_Fr.rc
dll/win32/localui/lang/ui_He.rc
dll/win32/localui/lang/ui_Hu.rc
dll/win32/localui/lang/ui_It.rc
dll/win32/localui/lang/ui_Ja.rc
dll/win32/localui/lang/ui_Ko.rc
dll/win32/localui/lang/ui_Lt.rc
dll/win32/localui/lang/ui_Nl.rc
dll/win32/localui/lang/ui_No.rc
dll/win32/localui/lang/ui_Pl.rc
dll/win32/localui/lang/ui_Pt.rc
dll/win32/localui/lang/ui_Ro.rc
dll/win32/localui/lang/ui_Ru.rc
dll/win32/localui/lang/ui_Si.rc
dll/win32/localui/lang/ui_Sq.rc
dll/win32/localui/lang/ui_Sv.rc
dll/win32/localui/lang/ui_Tr.rc
dll/win32/localui/lang/ui_Uk.rc
dll/win32/localui/lang/ui_Zh.rc
dll/win32/lsasrv/authport.c
dll/win32/lsasrv/lsasrv.h
dll/win32/lsasrv/session.c
dll/win32/mgmtapi/CMakeLists.txt
dll/win32/mgmtapi/mgmtapi.c
dll/win32/mgmtapi/mgmtapi.spec
dll/win32/mmdevapi/devenum.c
dll/win32/mmdevapi/mmdevapi_classes.idl
dll/win32/mpr/lang/mpr_Bg.rc
dll/win32/mpr/lang/mpr_Cs.rc
dll/win32/mpr/lang/mpr_Da.rc
dll/win32/mpr/lang/mpr_De.rc
dll/win32/mpr/lang/mpr_En.rc
dll/win32/mpr/lang/mpr_Es.rc
dll/win32/mpr/lang/mpr_Fr.rc
dll/win32/mpr/lang/mpr_He.rc
dll/win32/mpr/lang/mpr_Hu.rc
dll/win32/mpr/lang/mpr_It.rc
dll/win32/mpr/lang/mpr_Ja.rc
dll/win32/mpr/lang/mpr_Ko.rc
dll/win32/mpr/lang/mpr_Lt.rc
dll/win32/mpr/lang/mpr_Nl.rc
dll/win32/mpr/lang/mpr_No.rc
dll/win32/mpr/lang/mpr_Pl.rc
dll/win32/mpr/lang/mpr_Pt.rc
dll/win32/mpr/lang/mpr_Ro.rc
dll/win32/mpr/lang/mpr_Ru.rc
dll/win32/mpr/lang/mpr_Si.rc
dll/win32/mpr/lang/mpr_Sq.rc
dll/win32/mpr/lang/mpr_Sv.rc
dll/win32/mpr/lang/mpr_Tr.rc
dll/win32/mpr/lang/mpr_Uk.rc
dll/win32/mpr/lang/mpr_Zh.rc
dll/win32/mpr/wnet.c
dll/win32/secur32/lsalpc.c
include/dxsdk/dsdriver.h
include/dxsdk/dxfile.h
include/ndk/cmtypes.h
include/psdk/d3drm.h
include/psdk/d3drmdef.h
include/psdk/d3drmobj.h
include/psdk/d3drmwin.h
include/psdk/ddraw.h
include/reactos/subsys/lsass/lsass.h
lib/fast486/common.c
lib/fast486/fast486.c
media/doc/README.WINE
ntoskrnl/config/cmapi.c
ntoskrnl/fsrtl/name.c
subsystems/ntvdm/bios/bios32/bios32.c
subsystems/ntvdm/emulator.c
win32ss/user/winsrv/consrv.cmake

Simple merge
index 0000000,b1d2e69..b1d2e69
mode 000000,100644..100644
--- /dev/null
index 0000000,4108a72..4108a72
mode 000000,100644..100644
--- /dev/null
index 0000000,9b01575..9b01575
mode 000000,100644..100644
--- /dev/null
index 0000000,5cb3734..5cb3734
mode 000000,100644..100644
--- /dev/null
index 0000000,1e0f056..1e0f056
mode 000000,100644..100644
--- /dev/null
index 0000000,4145ee1..4145ee1
mode 000000,100644..100644
--- /dev/null
index 0000000,4e6fa27..4e6fa27
mode 000000,100644..100644
--- /dev/null
index 0000000,698e222..698e222
mode 000000,100644..100644
--- /dev/null
index 0000000,fb580a1..fb580a1
mode 000000,100644..100644
--- /dev/null
index 0000000,a9ce437..a9ce437
mode 000000,100644..100644
--- /dev/null
index 0000000,d8bfaa7..d8bfaa7
mode 000000,100644..100644
--- /dev/null
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
Simple merge
index 0000000,a7a5472..a7a5472
mode 000000,100644..100644
--- /dev/null
index 0000000,05ba2d9..05ba2d9
mode 000000,100644..100644
--- /dev/null
index 0000000,a052d73..a052d73
mode 000000,100644..100644
--- /dev/null
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
index 0000000,bb7f4c6..bb7f4c6
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,f0ab369..f0ab369
mode 000000,100644..100644
--- /dev/null
index 0000000,bd3a40d..bd3a40d
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge