Michael Stefaniuc : shdocvw: Import the version.rc into the main rc file.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Fri Jul  3 01:41:45 2009 +0200

shdocvw: Import the version.rc into the main rc file.

There is no need for a separate file.

---

 dlls/shdocvw/shdocvw.rc |   10 +++++++++-
 dlls/shdocvw/version.rc |   27 ---------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc
index 47718c1..bb4809b 100644
--- a/dlls/shdocvw/shdocvw.rc
+++ b/dlls/shdocvw/shdocvw.rc
@@ -16,7 +16,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "version.rc"
+#define WINE_OLESELFREGISTER
+#define WINE_FILEDESCRIPTION_STR "Wine core dll"
+#define WINE_FILENAME_STR "shdocvw.dll"
+#define WINE_FILEVERSION 6,0,2900,2180
+#define WINE_FILEVERSION_STR "6.0.2900.2180"
+#define WINE_PRODUCTVERSION 6,0,2900,2180
+#define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
+
+#include "wine/wine_common_ver.rc"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
diff --git a/dlls/shdocvw/version.rc b/dlls/shdocvw/version.rc
deleted file mode 100644
index 103b77c..0000000
--- a/dlls/shdocvw/version.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2003 Francois Gouget (for CodeWeavers)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define WINE_OLESELFREGISTER
-#define WINE_FILEDESCRIPTION_STR "Wine core dll"
-#define WINE_FILENAME_STR "shdocvw.dll"
-#define WINE_FILEVERSION 6,0,2900,2180
-#define WINE_FILEVERSION_STR "6.0.2900.2180"
-#define WINE_PRODUCTVERSION 6,0,2900,2180
-#define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
-
-#include "wine/wine_common_ver.rc"