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

[Alexandre Julliard]

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

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

mshtml: Merge propbag.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/pluginhost.c | 321 ++++++++++++++++++++++++++++++++++++++++++
 dlls/mshtml/pluginhost.h |   2 -
 dlls/mshtml/propbag.c    | 357 -----------------------------------------------
 4 files changed, 321 insertions(+), 360 deletions(-)

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