Merge remote-tracking branch 'origin/master' into custom

2026-10-05 14:57:30 +09:00 · 2021-05-10 10:08:49 +08:00 · 2021-05-10 10:08:49 +08:00 · 1d77ae7705
commit 1d77ae7705
parent 8eb3a2701c 214ac352e5
359 changed files with 10 additions and 52627 deletions
--- a/application/palemoon/branding/shared/branding.mozbuild
+++ b/application/palemoon/branding/shared/branding.mozbuild
@ -30,14 +30,6 @@ def ApplicationBranding():
            'wizHeaderRTL.bmp',
            'wizWatermark.bmp',
        ]
-    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-        BRANDING_FILES += [
-            '../shared/background.png',
-            'disk.icns',
-            'document.icns',
-            'dsstore',
-            'firefox.icns',
-        ]
    elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
        BRANDING_FILES += [
            'default16.png',
--- a/application/palemoon/branding/unofficial/disk.icns
+++ b/application/palemoon/branding/unofficial/disk.icns
--- a/application/palemoon/branding/unofficial/document.icns
+++ b/application/palemoon/branding/unofficial/document.icns
--- a/application/palemoon/branding/unofficial/dsstore
+++ b/application/palemoon/branding/unofficial/dsstore
--- a/application/palemoon/branding/unofficial/firefox.icns
+++ b/application/palemoon/branding/unofficial/firefox.icns