diff options
author | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
---|---|---|
committer | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
commit | 5261f4659a94e49046d26c6d6d2b2f75d7aca289 (patch) | |
tree | c85e326534133066ae301b48525d034a4735b2a6 /MdePkg/MdePkg.dec | |
parent | 4533f02a98912c745b036d8e6e836e942f244d12 (diff) | |
parent | 48c8a38e05b73fc8b8eb72dbbdafa02a81b97818 (diff) |
Fix merge conflicts.linaro-edk2-2014.04
Merge branch 'release-prep'
Conflicts:
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
Signed-off-by: Steven Kinney <steven.kinney@amd.com>
Diffstat (limited to 'MdePkg/MdePkg.dec')
-rw-r--r-- | MdePkg/MdePkg.dec | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index affff516e..4daf3e6a7 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -1375,7 +1375,8 @@ ## If TRUE, the driver diagnostics2 protocol will not be installed.
gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE|BOOLEAN|0x00000011
- ## Indicates whether EFI 1.1 ISO 639-2 language supports are obsolete
+ ## Indicates whether EFI 1.1 ISO 639-2 language supports are obsolete.
+ # If TRUE, Variable driver will be also not to auto update between PlatformLang and Lang variables.
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate|FALSE|BOOLEAN|0x00000012
## If TRUE, UGA Draw Protocol is still consumed.
|