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

[Alexandre Julliard]

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

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

mshtml: Merge htmlframebase.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     | 742 ++++++++++++++++++++++++++++++++++++++++++-
 dlls/mshtml/htmlframebase.c | 752 --------------------------------------------
 3 files changed, 731 insertions(+), 764 deletions(-)

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