Author: akhaldi
Date: Wed Dec 16 22:08:25 2015
New Revision: 70371
URL:
http://svn.reactos.org/svn/reactos?rev=70371&view=rev
Log:
[0.4.0] * Merge expanding the wallpaper by default from r70363. CORE-10709
Modified:
branches/ros-branch-0_4_0/ (props changed)
branches/ros-branch-0_4_0/reactos/ (props changed)
branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf
Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 16 22:08:25 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70355,70357-70358,70360,70363
+/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70355,70357-70358,70360,70363,70369
Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 16 22:08:25 2015
@@ -20,4 +20,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70355,70357-70358,70360,70363
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70355,70357-70358,70360,70363,70369
Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Dec 16
22:08:25 2015
@@ -66,7 +66,7 @@
HKCU,"Control Panel\Desktop","Pattern",2,"(None)"
HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
HKCU,"Control Panel\Desktop","TileWallpaper",2,"0"
-HKCU,"Control Panel\Desktop","WallpaperStyle",2,"0"
+HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2"
HKCU,"Control Panel\Desktop","FontSmoothing",0,"1"
HKCU,"Control
Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001
HKCU,"Control
Panel\Desktop","FontSmoothingType",0x00010003,0x00000001