Jacek Caban : mshtml: Merge htmliframe.c into htmlframe.c.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Feb 27 14:57:43 2018 +0100

mshtml: Merge htmliframe.c into htmlframe.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/htmlframe.c      | 590 ++++++++++++++++++++++++++++++++++++++++-
 dlls/mshtml/htmliframe.c     | 616 -------------------------------------------
 dlls/mshtml/mshtml_private.h |   4 -
 4 files changed, 587 insertions(+), 624 deletions(-)

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