Author: cfinck
Date: Tue Feb 3 05:30:10 2009
New Revision: 39308
URL:
http://svn.reactos.org/svn/reactos?rev=39308&view=rev
Log:
Merge 39307 and use the wallpaper (1/2)
Modified:
branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf
branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff
Modified: branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Tue Feb
3 05:30:10 2009
@@ -20,7 +20,7 @@
HKCU,"Control
Panel\Desktop","HungAppTimeout",0x00000002,"5000"
HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,""
HKCU,"Control
Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000"
-HKCU,"Control
Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\lake.bmp"
+HKCU,"Control
Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus.02_ROSWP.bmp"
HKCU,"Control Panel\International",,0x00000012
HKCU,"Control
Panel\International","Locale",0x00000000,"0409"
HKCU,"Control
Panel\International\Geo","Nation",0x00000000,"1"
Modified: branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue
Feb 3 05:30:10 2009
@@ -684,7 +684,7 @@
modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional
modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional
-modules\wallpaper\lake.bmp 4 optional
+modules\wallpaper\Angelus.02_ROSWP.bmp 4 optional
; Native libraries
modules\windows\mfc42.dll 1 optional