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

[Alexandre Julliard]

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

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

mshtml: Merge htmlstyle2.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  | 601 +++++++++++++++++++++++++++++++++++++++++++-
 dlls/mshtml/htmlstyle.h  |   1 -
 dlls/mshtml/htmlstyle2.c | 637 -----------------------------------------------
 4 files changed, 600 insertions(+), 640 deletions(-)

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