[PATCH 2/7] mshtml: Merge htmliframe.c into htmlframe.c.

[Jacek Caban]

Signed-off-by: Jacek Caban 
---
 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(-)
 delete mode 100644 dlls/mshtml/htmliframe.c