[ros-diffs] [janderwald] 24955: revert commit

[janderwald at svn.reactos.org]

Author: janderwald
Date: Wed Nov 29 01:04:31 2006
New Revision: 24955

URL: http://svn.reactos.org/svn/reactos?rev=24955&view=rev
Log:
revert commit

Added:
    trunk/reactos/base/setup/reactos/cs-CZ.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/cs-CZ.rc
    trunk/reactos/base/setup/reactos/de-DE.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/de-DE.rc
    trunk/reactos/base/setup/reactos/en-US.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/en-US.rc
    trunk/reactos/base/setup/reactos/fi-FI.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/fi-FI.rc
    trunk/reactos/base/setup/reactos/fr-FR.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/fr-FR.rc
    trunk/reactos/base/setup/reactos/hu-HU.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/hu-HU.rc
    trunk/reactos/base/setup/reactos/it-IT.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/it-IT.rc
    trunk/reactos/base/setup/reactos/ja-JP.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/ja-JP.rc
    trunk/reactos/base/setup/reactos/nb-NO.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/nb-NO.rc
    trunk/reactos/base/setup/reactos/nl-NL.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/nl-NL.rc
    trunk/reactos/base/setup/reactos/ru-RU.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/ru-RU.rc
    trunk/reactos/base/setup/reactos/sv-SE.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/sv-SE.rc
    trunk/reactos/base/setup/reactos/uk-UA.rc
      - copied unchanged from r24951, trunk/reactos/base/setup/reactos/uk-UA.rc
Removed:
    trunk/reactos/base/setup/reactos/lang/
    trunk/reactos/base/setup/reactos/rsrc.rc
Modified:
    trunk/reactos/base/setup/reactos/reactos.rc

Modified: trunk/reactos/base/setup/reactos/reactos.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos.rc?rev=24955&r1=24954&r2=24955&view=diff
==============================================================================
--- trunk/reactos/base/setup/reactos/reactos.rc (original)
+++ trunk/reactos/base/setup/reactos/reactos.rc Wed Nov 29 01:04:31 2006
@@ -8,6 +8,26 @@
 #define REACTOS_STR_ORIGINAL_FILENAME	"reactos.exe\0"
 #include <reactos/version.rc>
 
-#include "rsrc.rc"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+/* Icons */
+IDI_MAIN ICON "res/reactos.ico"
+
+
+/* Language-specific resources */
+#include "cs-CZ.rc"
+#include "de-DE.rc"
+#include "en-US.rc"
+#include "fi-FI.rc"
+#include "fr-FR.rc"
+#include "hu-HU.rc"
+#include "it-IT.rc"
+#include "ja-JP.rc"
+#include "nl-NL.rc"
+#include "nb-NO.rc"
+#include "ru-RU.rc"
+#include "sv-SE.rc"
+#include "uk-UA.rc"
 
 /* EOF */

Removed: trunk/reactos/base/setup/reactos/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc?rev=24954&view=auto
==============================================================================
--- trunk/reactos/base/setup/reactos/rsrc.rc (original)
+++ trunk/reactos/base/setup/reactos/rsrc.rc (removed)
@@ -1,23 +1,0 @@
-#include <windows.h>
-#include "resource.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-/* Icons */
-IDI_MAIN ICON "res/reactos.ico"
-
-
-/* Language-specific resources */
-#include "lang/cs-CZ.rc"
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/fi-FI.rc"
-#include "lang/fr-FR.rc"
-#include "lang/hu-HU.rc"
-#include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
-#include "lang/nl-NL.rc"
-#include "lang/nb-NO.rc"
-#include "lang/ru-RU.rc"
-#include "lang/sv-SE.rc"
-#include "lang/uk-UA.rc"