Fix merge r65567.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 5 Dec 2014 22:24:49 +0000 (22:24 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 5 Dec 2014 22:24:49 +0000 (22:24 +0000)
commitf6b392dd4c85f4a71e5d98f3b8cb16462bc337fc
treecbc5ac35a707b32ec251c167390f92dcfdee5a89
parent9919d4fa10282fdba6bcb4816c7e893d73c449c7
parenta381da464a9b953513ab7813cf0ee7361f033faf
Fix merge r65567.

svn path=/branches/condrv_restructure/; revision=65570
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
win32ss/user/winsrv/consrv/history.c
win32ss/user/winsrv/consrv/init.c
win32ss/user/winsrv/consrv/popup.c