aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/protobuf/bundlemerge.proto
Commit message (Collapse)AuthorAge
* Pass bundle_id attribute to PlMerge if it is explicitly setGravatar Googler2015-02-25
| | | | | | | | | * Adds primary and fallback bundle ID fields * Adds conflict resolution that considers IDs in order: plist file, primary ID (set in BUILD file), fallback ID (Blaze default). If plist and primary are both set, they should be equal, otherwise an error is thrown. -- MOS_MIGRATED_REVID=87106031
* Update from Google.Gravatar Han-Wen Nienhuys2015-02-25
-- MOE_MIGRATED_REVID=85702957