Sync with trunk r62529.
authorDavid Quintana <gigaherz@gmail.com>
Tue, 18 Mar 2014 14:39:04 +0000 (14:39 +0000)
committerDavid Quintana <gigaherz@gmail.com>
Tue, 18 Mar 2014 14:39:04 +0000 (14:39 +0000)
svn path=/branches/shell-experiments/; revision=62530

33 files changed:
1  2 
base/applications/cmdutils/CMakeLists.txt
base/applications/cmdutils/doskey/doskey.rc
base/applications/cmdutils/find/find.rc
base/applications/cmdutils/mode/CMakeLists.txt
base/applications/cmdutils/mode/mode.c
base/applications/cmdutils/mode/mode.rc
base/applications/cmdutils/more/CMakeLists.txt
base/applications/cmdutils/more/more.rc
base/applications/cmdutils/xcopy/rsrc.rc
base/shell/cmd/lang/es-ES.rc
base/shell/cmd/lang/fr-FR.rc
base/shell/cmd/lang/hu-HU.rc
base/shell/cmd/lang/id-ID.rc
base/shell/cmd/lang/it-IT.rc
base/shell/cmd/lang/no-NO.rc
base/shell/cmd/lang/pl-PL.rc
base/shell/cmd/lang/ru-RU.rc
base/shell/cmd/lang/sv-SE.rc
cmake/msvc.cmake
dll/win32/msv1_0/msv1_0.c
drivers/input/i8042prt/pnp.c
drivers/usb/usbd/usbd.c
ntoskrnl/io/pnpmgr/pnpmgr.c
win32ss/user/ntuser/menu.c
win32ss/user/ntuser/window.c
win32ss/user/user32/windows/menu.c
win32ss/user/winsrv/consrv/condrv/graphics.c
win32ss/user/winsrv/consrv/condrv/text.c
win32ss/user/winsrv/consrv/frontends/gui/graphics.c
win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
win32ss/user/winsrv/consrv/frontends/gui/text.c
win32ss/user/winsrv/consrv/settings.c

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