Bug 1314023 - Add dev edition branding exceptions to allowed duplicates
MozReview-Commit-ID: 2Szg0XRURqM
--- 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