]> git.proxmox.com Git - mirror_edk2.git/commit
projects / mirror_edk2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b25e4ae) | patch
Resolve conflicted PCD TokenValue
authorhhtian <hhtian@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 2 Sep 2011 13:30:38 +0000 (13:30 +0000)
committerhhtian <hhtian@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 2 Sep 2011 13:30:38 +0000 (13:30 +0000)
commit6bea33367b7d074d5a7ac7b3acaa7027377c72f2
tree0d93340748e1a75de3b74ffec0627c684073add8tree
parentb25e4aebc4be996ef05905478cb9d9734fb7d605commit | diff
Resolve conflicted PCD TokenValue

Signed-off-by: hhtian
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12268 6f19259b-4bc3-4df7-8a09-765794883524
MdeModulePkg/MdeModulePkg.dec diff | blob | blame | history
EFI Development Kit II mirror for PVE