Partial merge of condrv_restructure branch r65657.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sun, 14 Dec 2014 22:57:49 +0000 (22:57 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sun, 14 Dec 2014 22:57:49 +0000 (22:57 +0000)
svn path=/trunk/; revision=65660

54 files changed:
1  2 
reactos/drivers/base/condrv/CMakeLists.txt
reactos/drivers/base/condrv/condrv.c
reactos/drivers/base/condrv/dispatch.c
reactos/win32ss/user/winsrv/consrv/alias.c
reactos/win32ss/user/winsrv/consrv/alias.h
reactos/win32ss/user/winsrv/consrv/api.h
reactos/win32ss/user/winsrv/consrv/condrv/coninput.c
reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c
reactos/win32ss/user/winsrv/consrv/condrv/console.c
reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c
reactos/win32ss/user/winsrv/consrv/condrv/graphics.c
reactos/win32ss/user/winsrv/consrv/condrv/text.c
reactos/win32ss/user/winsrv/consrv/coninput.c
reactos/win32ss/user/winsrv/consrv/coninput.h
reactos/win32ss/user/winsrv/consrv/conoutput.c
reactos/win32ss/user/winsrv/consrv/conoutput.h
reactos/win32ss/user/winsrv/consrv/console.c
reactos/win32ss/user/winsrv/consrv/console.h
reactos/win32ss/user/winsrv/consrv/consrv.h
reactos/win32ss/user/winsrv/consrv/frontendctl.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
reactos/win32ss/user/winsrv/consrv/frontends/input.c
reactos/win32ss/user/winsrv/consrv/frontends/terminal.c
reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h
reactos/win32ss/user/winsrv/consrv/handle.c
reactos/win32ss/user/winsrv/consrv/handle.h
reactos/win32ss/user/winsrv/consrv/heap.h
reactos/win32ss/user/winsrv/consrv/history.c
reactos/win32ss/user/winsrv/consrv/history.h
reactos/win32ss/user/winsrv/consrv/include/conio.h
reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h
reactos/win32ss/user/winsrv/consrv/include/console.h
reactos/win32ss/user/winsrv/consrv/include/settings.h
reactos/win32ss/user/winsrv/consrv/include/term.h
reactos/win32ss/user/winsrv/consrv/init.c
reactos/win32ss/user/winsrv/consrv/lineinput.c
reactos/win32ss/user/winsrv/consrv/lineinput.h
reactos/win32ss/user/winsrv/consrv/popup.c
reactos/win32ss/user/winsrv/consrv/popup.h
reactos/win32ss/user/winsrv/consrv/procinit.h
reactos/win32ss/user/winsrv/consrv/resource.h
reactos/win32ss/user/winsrv/consrv/settings.c
reactos/win32ss/user/winsrv/consrv/shutdown.c
reactos/win32ss/user/winsrv/consrv/subsysreg.c

Simple merge
index 0000000,65a3869..65a3869
mode 000000,100644..100644
--- /dev/null