Jacek Caban : mshtml: Merge htmlscreen.c into imnavigator.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 86bdba81ad843283028aebea20a2eb000a39a1d9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=86bdba81ad843283028aebea20a2eb000a39a1d9

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Feb 28 16:31:41 2018 +0100

mshtml: Merge htmlscreen.c into imnavigator.c.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/Makefile.in   |   1 -
 dlls/mshtml/htmlscreen.c  | 263 ----------------------------------------------
 dlls/mshtml/omnavigator.c | 233 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 232 insertions(+), 265 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=86bdba81ad843283028aebea20a2eb000a39a1d9