Jacek Caban : mshtml: Merge olewnd.c into oleobj.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e1c211eaee7450e240b937d3c95307b374b1ea9d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e1c211eaee7450e240b937d3c9...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Nov 17 17:46:20 2017 +0100

mshtml: Merge olewnd.c into oleobj.c.

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

---

 dlls/mshtml/Makefile.in      |   1 -
 dlls/mshtml/htmldoc.c        |   1 -
 dlls/mshtml/mshtml_private.h |   1 -
 dlls/mshtml/oleobj.c         | 246 +++++++++++++++++++++++++++++++++++++
 dlls/mshtml/olewnd.c         | 286 -------------------------------------------
 5 files changed, 246 insertions(+), 289 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1c211eaee7450e240b937...