mshtml: Merge htmlframebase.c into htmlframe.c.

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

mshtml: Merge htmlframebase.c into htmlframe.c.
1f8ff829 · Jacek Caban · Alexandre Julliard · e7b66cfe · 1f8ff829 · 1f8ff829
Commit 1f8ff829 authored Feb 27, 2018 by Jacek Caban Committed by Alexandre Julliard Feb 27, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Makefile.in dlls/mshtml/Makefile.in +0 -1

htmlframe.c dlls/mshtml/htmlframe.c +0 -0

htmlframebase.c dlls/mshtml/htmlframebase.c +0 -0

No files found.
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	htmlevent.c \
 	htmlform.c \
 	htmlframe.c \
-	htmlframebase.c \
 	htmlgeneric.c \
 	htmlhead.c \
 	htmliframe.c \

--- a/dlls/mshtml/htmlframe.c
+++ b/dlls/mshtml/htmlframe.c
--- a/dlls/mshtml/htmlframebase.c
+++ b/dlls/mshtml/htmlframebase.c