[ros-diffs] 02/02: Merge branch 'master' of https://github.com/reactos/reactos

[Alex Ionescu]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1683934cd8583bb4947c0…

commit 1683934cd8583bb4947c035cd76ae08913053597
Merge: 16e0cca7e1 131678a025
Author:     Alex Ionescu <aionescu(a)gmail.com>
AuthorDate: Sun Feb 4 09:34:27 2018 -0800
Commit:     Alex Ionescu <aionescu(a)gmail.com>
CommitDate: Sun Feb 4 09:34:27 2018 -0800

    Merge branch 'master' of https://github.com/reactos/reactos

 base/setup/usetup/CMakeLists.txt      |    2 +-
 base/setup/usetup/cabinet.c           |    1 +
 base/shell/explorer/syspager.cpp      |   57 +-
 boot/environ/app/rosload/rosload.c    |    2 +-
 dll/3rdparty/mbedtls/CMakeLists.txt   |    1 -
 dll/shellext/netshell/lanstatusui.cpp |    4 +-
 dll/shellext/stobject/csystray.cpp    |    2 +-
 dll/shellext/stobject/hotplug.cpp     |    3 +-
 dll/win32/browseui/browseui.rc        |    1 +
 dll/win32/setupapi/cfgmgr.c           | 1201 +++++++++++++++++++++++----------
 dll/win32/shell32/precomp.h           |    5 +
 dll/win32/shell32/systray.cpp         |  217 ++++--
 sdk/include/psdk/shellapi.h           |   15 +-
 sdk/include/reactos/undocshell.h      |   31 +-
 14 files changed, 1071 insertions(+), 471 deletions(-)