Bug 1314023 - Add dev edition branding exceptions to allowed duplicates draft
authorChris AtLee <catlee@mozilla.com>
Mon, 31 Oct 2016 14:21:52 -0400
changeset 435339 2551f2d26efa8b663f35840392c1f719be321505
parent 435182 f13e90d496cf1bc6dfc4fd398da33e4afe785bde
child 536283 a75f03bb8f70b056d6e5ca7de785466087abb21f
push id35008
push usercatlee@mozilla.com
push dateTue, 08 Nov 2016 14:01:38 +0000
bugs1314023
milestone52.0a1
Bug 1314023 - Add dev edition branding exceptions to allowed duplicates MozReview-Commit-ID: 2Szg0XRURqM
browser/installer/allowed-dupes.mn
mobile/android/installer/allowed-dupes.mn
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -215,8 +215,12 @@ modules/commonjs/sdk/ui/button/view/even
 modules/commonjs/sdk/ui/state/events.js
 plugin-container.app/Contents/PkgInfo
 res/table-remove-column-active.gif
 res/table-remove-column-hover.gif
 res/table-remove-column.gif
 res/table-remove-row-active.gif
 res/table-remove-row-hover.gif
 res/table-remove-row.gif
+# Aurora branding
+browser/chrome/browser/content/browser/defaultthemes/devedition.icon.png
+browser/chrome/browser/content/branding/icon64.png
+browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-logo.png
--- a/mobile/android/installer/allowed-dupes.mn
+++ b/mobile/android/installer/allowed-dupes.mn
@@ -112,8 +112,10 @@ modules/devtools/shared/Console.jsm
 modules/devtools/shared/Loader.jsm
 modules/devtools/shared/apps/Simulator.jsm
 res/table-remove-column-active.gif
 res/table-remove-column-hover.gif
 res/table-remove-column.gif
 res/table-remove-row-active.gif
 res/table-remove-row-hover.gif
 res/table-remove-row.gif
+modules/commonjs/index.js
+chrome/toolkit/content/global/XPCNativeWrapper.js