[amunger] 20195: *Tweetmerge -r 20194:20193 . *Yellow Card* Revert 20194. *g*

*Tweetmerge -r 20194:20193 . *Yellow Card* Revert 20194. *g*
Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf
  _____

Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf
--- branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf
2005-12-15 18:53:33 UTC (rev 20194)
+++ branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf
2005-12-15 19:12:37 UTC (rev 20195)
@@ -749,9 +749,9 @@

HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDr
ivers",0x00010000,"framebuf"

HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default
Settings.VRefresh",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default
Settings.BitsPerPel",0x00010001,16
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default
Settings.XResolution",0x00010001,800
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default
Settings.YResolution",0x00010001,600
+HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default
Settings.BitsPerPel",0x00010001,8
+HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default
Settings.XResolution",0x00010001,640
+HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default
Settings.YResolution",0x00010001,480

; VGA miniport driver

HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0
x00000000