Jacek Caban : mshtml: Merge htmlstyle3.c into htmlstyle.c.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Jan  7 14:06:24 2016 +0100

mshtml: Merge htmlstyle3.c into htmlstyle.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/htmlstyle.c  | 923 ++++++++++++++++++++++++++++++++++++++++++++-
 dlls/mshtml/htmlstyle.h  |   1 -
 dlls/mshtml/htmlstyle3.c | 958 -----------------------------------------------
 4 files changed, 922 insertions(+), 961 deletions(-)

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