Jacek Caban : mshtml: Merge htmlembed.c into htmlobject.c.

[Alexandre Julliard]

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

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

mshtml: Merge htmlembed.c into htmlobject.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/htmlembed.c  | 289 -----------------------------------------------
 dlls/mshtml/htmlobject.c | 256 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 256 insertions(+), 290 deletions(-)

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