Jacek Caban : mshtml: Merge ipwindow.c into pluginhost.c.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Feb 28 16:32:05 2018 +0100

mshtml: Merge ipwindow.c into pluginhost.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/ipwindow.c   | 347 -----------------------------------------------
 dlls/mshtml/pluginhost.c | 311 ++++++++++++++++++++++++++++++++++++++++++
 dlls/mshtml/pluginhost.h |   3 -
 4 files changed, 311 insertions(+), 351 deletions(-)

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