Jacek Caban : mshtml: Remove conflicts between resource.h and mshtmcid.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5c7078b2686747833d6771e064c432b6f23ef0cb
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=5c7078b2686747833d6771e0...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Wed Sep 27 16:36:19 2006 +0200

mshtml: Remove conflicts between resource.h and mshtmcid.h.

---

 dlls/mshtml/Bg.rc      |    8 ++++----
 dlls/mshtml/De.rc      |    8 ++++----
 dlls/mshtml/En.rc      |    8 ++++----
 dlls/mshtml/Fi.rc      |    8 ++++----
 dlls/mshtml/Fr.rc      |    8 ++++----
 dlls/mshtml/Hu.rc      |    8 ++++----
 dlls/mshtml/Ko.rc      |    8 ++++----
 dlls/mshtml/Nl.rc      |    8 ++++----
 dlls/mshtml/No.rc      |    8 ++++----
 dlls/mshtml/Sv.rc      |    8 ++++----
 dlls/mshtml/Tr.rc      |    8 ++++----
 dlls/mshtml/resource.h |    4 +---
 dlls/mshtml/rsrc.rc    |    1 +
 13 files changed, 46 insertions(+), 47 deletions(-)

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