Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Protocol/EdidDiscovered.h

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdePkg/Include/Protocol/EdidDiscovered.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Protocol/EdidDiscovered.h

@@ -5 +5 @@
   the EDID information being used for the output device represented by the child handle.
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
@@ -40 +40 @@
   /// NULL if no EDID information is available for the video output
   /// device. The minimum size of a valid Edid buffer is 128 bytes.
-  /// EDID information is defined in the E-DID EEPROM
+  /// EDID information is defined in the E-EDID EEPROM
   /// specification published by VESA (www.vesa.org).
   ///