Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Config.vfr

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)
• NetworkPkg/Ip6Dxe/Ip6Config.vfr (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Config.vfr

@@ -128 +128 @@
       help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),
       text   = STRING_TOKEN (STR_SAVE_CHANGES),
-        text   = STRING_TOKEN (STR_NULL),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CHANGES;
@@ -167 +166 @@
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CONFIG_CHANGES;
@@ -174 +172 @@
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_IGNORE_CONFIG_CHANGES;