[ros-diffs] [cfinck] 41667: Merge 41666
cfinck at svn.reactos.org
cfinck at svn.reactos.org
Sun Jun 28 16:59:35 CEST 2009
Author: cfinck
Date: Sun Jun 28 18:59:34 2009
New Revision: 41667
URL: http://svn.reactos.org/svn/reactos?rev=41667&view=rev
Log:
Merge 41666
Modified:
branches/ros-branch-0_3_10/reactos/ (props changed)
branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff
branches/ros-branch-0_3_10/reactos/modules/ (props changed)
branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h (props changed)
branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c (props changed)
branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h (props changed)
branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak (props changed)
branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c (props changed)
Propchange: branches/ros-branch-0_3_10/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 28 18:59:34 2009
@@ -1,1 +1,1 @@
-/trunk/reactos:41447,41526
+/trunk/reactos:41447,41526,41666
Modified: branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff?rev=41667&r1=41666&r2=41667&view=diff
==============================================================================
--- branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 28 18:59:34 2009
@@ -654,7 +654,18 @@
subsystems\ntvdm\ntvdm.exe 1
subsystems\win32\win32k\win32k.sys 1
-; Modules
+; Optional/proprietary files
+modules\optional\kvmnet.inf 6 optional
+modules\optional\kvmnet.sys 2 optional
+modules\optional\mfc42.dll 1 optional
+modules\optional\Systema.ttf 3 optional
+modules\optional\vmx_fb.dll 1 optional
+modules\optional\vmx_mode.dll 1 optional
+modules\optional\vmx_svga.inf 6 optional
+modules\optional\vmx_svga.sys 2 optional
+modules\optional\wine_gecko-0.9.1.cab 4 optional
+
+; Rosapps
modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional
modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional
modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional
@@ -705,6 +716,7 @@
modules\rosapps\demos\maze\maze.exe 1 optional
modules\rosapps\drivers\green\green.sys 2 optional
+; Rostests
modules\rostests\rosautotest\rosautotest.exe 1 optional
modules\rostests\tests\pseh2\pseh2_test.exe 7 optional
modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional
@@ -760,15 +772,3 @@
modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional
modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional
-
-; Native libraries
-modules\windows\mfc42.dll 1 optional
-modules\windows\vmx_fb.dll 1 optional
-modules\windows\vmx_mode.dll 1 optional
-modules\windows\vmx_svga.sys 2 optional
-modules\windows\vmx_svga.inf 6 optional
-modules\windows\kvmnet.sys 2 optional
-modules\windows\kvmnet.inf 6 optional
-
-; Gecko
-modules\windows\wine_gecko-0.9.1.cab 4 optional
Propchange: branches/ros-branch-0_3_10/reactos/modules/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jun 28 18:59:34 2009
@@ -5,3 +5,4 @@
*.ncb
*.suo
*.sln
+optional
Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 28 18:59:34 2009
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095
-/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526
+/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666
Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 28 18:59:34 2009
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym.c:41447,41526
+/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666
Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 28 18:59:34 2009
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym.h:41447,41526
+/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666
Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 28 18:59:34 2009
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym.mak:41447,41526
+/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666
Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 28 18:59:34 2009
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym_common.c:41447,41526
+/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666
More information about the Ros-diffs
mailing list