[ros-diffs] [gedmurphy] 25616: merge r25600

[gedmurphy at svn.reactos.org]

Author: gedmurphy
Date: Wed Jan 24 18:26:51 2007
New Revision: 25616

URL: http://svn.reactos.org/svn/reactos?rev=25616&view=rev
Log:
merge r25600

Modified:
    branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesft.inf

Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesft.inf
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesft.inf?rev=25616&r1=25615&r2=25616&view=diff
==============================================================================
--- branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesft.inf (original)
+++ branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesft.inf Wed Jan 24 18:26:51 2007
@@ -40,7 +40,6 @@
 ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Vera Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Vera Sans Mono"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Marlett",0x00000000,"TGMarlett"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"DejaVu Vera Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Vera Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Vera Sans"