Sync to trunk revision 63922.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sat, 23 Aug 2014 15:51:37 +0000 (15:51 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sat, 23 Aug 2014 15:51:37 +0000 (15:51 +0000)
svn path=/branches/condrv_restructure/; revision=63923

57 files changed:
1  2 
base/applications/rapps/misc.c
base/shell/explorer/shell/shellfs.cpp
base/shell/explorer/shell/winfs.cpp
base/shell/explorer/shell/winfs.h
boot/bootdata/packages/CMakeLists.txt
cmake/CMakeMacros.cmake
cmake/gcc.cmake
dll/cpl/appwiz/addons.c
dll/win32/shell32/defcontextmenu.cpp
dll/win32/shell32/folders/admintools.cpp
dll/win32/shell32/folders/admintools.h
dll/win32/shell32/folders/cpanel.cpp
dll/win32/shell32/folders/cpanel.h
dll/win32/shell32/folders/desktop.cpp
dll/win32/shell32/folders/desktop.h
dll/win32/shell32/folders/fonts.cpp
dll/win32/shell32/folders/fonts.h
dll/win32/shell32/folders/fs.cpp
dll/win32/shell32/folders/fs.h
dll/win32/shell32/folders/mycomp.cpp
dll/win32/shell32/folders/mycomp.h
dll/win32/shell32/folders/mydocuments.cpp
dll/win32/shell32/folders/mydocuments.h
dll/win32/shell32/folders/netplaces.cpp
dll/win32/shell32/folders/netplaces.h
dll/win32/shell32/folders/printers.cpp
dll/win32/shell32/folders/printers.h
dll/win32/shell32/folders/recyclebin.cpp
dll/win32/shell32/folders/recyclebin.h
dll/win32/shell32/shlview.cpp
drivers/filesystems/npfs/seinfo.c
drivers/filesystems/npfs/waitsup.c
drivers/network/ndisuio/main.c
drivers/network/ndisuio/ndisuio.h
drivers/network/ndisuio/protocol.c
drivers/network/tcpip/tcpip/fileobjs.c
hal/halx86/generic/dma.c
include/crt/ivec.h
include/psdk/bthdef.h
include/psdk/driverspecs.h
include/psdk/shobjidl.idl
include/psdk/shtypes.idl
include/psdk/stralign.h
lib/drivers/ip/transport/rawip/rawip.c
lib/drivers/ip/transport/udp/udp.c
ntoskrnl/cc/copy.c
ntoskrnl/cc/fs.c
ntoskrnl/cc/view.c
ntoskrnl/config/cmsysini.c
ntoskrnl/include/internal/cc.h
ntoskrnl/io/iomgr/device.c
ntoskrnl/io/pnpmgr/pnpmgr.c
toolchain-gcc.cmake
win32ss/gdi/gdi32/objects/bitmap.c
win32ss/gdi/gdi32/objects/utils.c
win32ss/gdi/ntgdi/dibobj.c
win32ss/user/ntuser/misc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cmake/gcc.cmake
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,7d10e03..7d10e03
mode 000000,100644..100644
--- /dev/null
index 0000000,d49a60a..d49a60a
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,9b5637d..9b5637d
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