Bug 1314023 - Add dev edition branding exceptions to allowed duplicates r=Tomcat
authorChris AtLee <catlee@mozilla.com>
Mon, 31 Oct 2016 14:21:52 -0400
changeset 321662 53049dd09053d96543932c00a2bdcee7bc3118b7
parent 321661 c6b2839bcfa84d2937b69f4a4f53f638a66550af
child 321663 6184510d1b737b0a9cde17c5144af2891affa0d5
push id21
push usermaklebus@msu.edu
push dateThu, 01 Dec 2016 06:22:08 +0000
reviewersTomcat
bugs1314023
milestone52.0a1
Bug 1314023 - Add dev edition branding exceptions to allowed duplicates r=Tomcat 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