Sync with trunk for console graphics palettes.
authorAleksandar Andrejevic <aandrejevic@reactos.org>
Wed, 23 Oct 2013 00:26:50 +0000 (00:26 +0000)
committerAleksandar Andrejevic <aandrejevic@reactos.org>
Wed, 23 Oct 2013 00:26:50 +0000 (00:26 +0000)
svn path=/branches/ntvdm/; revision=60735

68 files changed:
1  2 
base/applications/mspaint/drawing.c
base/setup/usetup/lang/es-ES.h
base/shell/explorer/CMakeLists.txt
base/shell/explorer/explorer.cpp
base/shell/explorer/globals.h
base/shell/explorer/shell/shellbrowser.cpp
base/shell/explorer/shell/shellbrowser.h
base/shell/explorer/taskbar/desktopbar.cpp
base/shell/explorer/taskbar/startmenu.cpp
base/shell/explorer/taskbar/taskbar.cpp
base/shell/explorer/taskbar/traynotify.cpp
base/shell/explorer/utility/shellclasses.cpp
base/shell/explorer/utility/shellclasses.h
dll/ntdll/CMakeLists.txt
dll/ntdll/def/ntdll.spec
dll/win32/samsrv/samrpc.c
dll/win32/samsrv/samsrv.h
dll/win32/samsrv/security.c
dll/win32/samsrv/setup.c
dll/win32/shell32/shellord.cpp
include/ddk/ntsam.h
include/ndk/rtlfuncs.h
include/ndk/rtltypes.h
include/reactos/idl/sam.idl
lib/rtl/CMakeLists.txt
lib/rtl/memstream.c
ntoskrnl/include/internal/i386/asmmacro.S
ntoskrnl/include/internal/i386/ke.h
ntoskrnl/include/internal/i386/mm.h
ntoskrnl/include/internal/i386/trap_x.h
ntoskrnl/include/internal/ke.h
ntoskrnl/ke/i386/cpu.c
ntoskrnl/ke/i386/exp.c
ntoskrnl/ke/i386/patpge.c
ntoskrnl/ke/i386/trap.s
ntoskrnl/ke/i386/traphdlr.c
ntoskrnl/ke/i386/usercall.c
ntoskrnl/ke/i386/usercall_asm.S
ntoskrnl/ke/time.c
win32ss/gdi/ntgdi/gdiobj.c
win32ss/gdi/ntgdi/gdiobj.h
win32ss/include/ntuser.h
win32ss/user/ntuser/desktop.c
win32ss/user/ntuser/desktop.h
win32ss/user/ntuser/focus.c
win32ss/user/ntuser/focus.h
win32ss/user/ntuser/input.c
win32ss/user/ntuser/input.h
win32ss/user/ntuser/keyboard.c
win32ss/user/ntuser/main.c
win32ss/user/ntuser/message.c
win32ss/user/ntuser/misc.c
win32ss/user/ntuser/msgqueue.c
win32ss/user/ntuser/msgqueue.h
win32ss/user/ntuser/ntstubs.c
win32ss/user/ntuser/object.c
win32ss/user/ntuser/object.h
win32ss/user/ntuser/window.c
win32ss/user/ntuser/winpos.c
win32ss/user/user32/windows/prop.c
win32ss/user/winsrv/consrv/condrv/conoutput.c
win32ss/user/winsrv/consrv/condrv/text.c
win32ss/user/winsrv/consrv/conoutput.c
win32ss/user/winsrv/consrv/conoutput.h
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

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,776fbc6..776fbc6
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