| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Fri, 28 Apr 2017 19:49:33 +0200 | |
| branch | firefox52 |
| changeset 969 | 8d48ef5efb59 |
| parent 923 | 3cc9f17ca9bb |
| child 952 | 8094e6bba260 |
| permissions | -rw-r--r-- |
| 252 | 1 |
# HG changeset patch |
| 828 | 2 |
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
| 923 | 3 |
# Parent 2bffb52e07b587a6c755d67c6fc971fed6509783 |
| 259 | 4 |
|
| 868 | 5 |
diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
6 |
--- a/browser/branding/branding-common.mozbuild |
|
7 |
+++ b/browser/branding/branding-common.mozbuild |
|
| 923 | 8 |
@@ -34,18 +34,24 @@ def FirefoxBranding(): |
| 909 | 9 |
'disk.icns', |
10 |
'document.icns', |
|
11 |
'dsstore', |
|
12 |
'firefox.icns', |
|
13 |
] |
|
| 923 | 14 |
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
| 909 | 15 |
BRANDING_FILES += [ |
16 |
'default16.png', |
|
17 |
+ 'default22.png', |
|
18 |
+ 'default24.png', |
|
19 |
+ 'default256.png', |
|
20 |
'default32.png', |
|
21 |
'default48.png', |
|
22 |
'mozicon128.png', |
|
23 |
] |
|
| 923 | 24 |
FINAL_TARGET_FILES.icons += ['mozicon128.png'] |
25 |
FINAL_TARGET_FILES.chrome.icons.default += [ |
|
26 |
'default16.png', |
|
27 |
+ 'default22.png', |
|
28 |
+ 'default24.png', |
|
29 |
+ 'default256.png', |
|
30 |
'default32.png', |
|
31 |
'default48.png', |
|
32 |
] |
|
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
33 |
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
34 |
--- a/browser/installer/package-manifest.in |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
35 |
+++ b/browser/installer/package-manifest.in |
| 923 | 36 |
@@ -650,18 +650,21 @@ |
| 868 | 37 |
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
| 828 | 38 |
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
39 |
@RESPATH@/chrome/toolkit@JAREXT@ |
|
40 |
@RESPATH@/chrome/toolkit.manifest |
|
41 |
@RESPATH@/chrome/recording.manifest |
|
42 |
@RESPATH@/chrome/recording/* |
|
| 659 | 43 |
#ifdef MOZ_GTK |
| 828 | 44 |
@RESPATH@/browser/chrome/icons/default/default16.png |
45 |
+@RESPATH@/browser/chrome/icons/default/default22.png |
|
46 |
+@RESPATH@/browser/chrome/icons/default/default24.png |
|
47 |
@RESPATH@/browser/chrome/icons/default/default32.png |
|
48 |
@RESPATH@/browser/chrome/icons/default/default48.png |
|
49 |
+@RESPATH@/browser/chrome/icons/default/default256.png |
|
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
50 |
#endif |
| 904 | 51 |
@RESPATH@/browser/features/* |
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
52 |
|
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
53 |
; [Webide Files] |
| 828 | 54 |
@RESPATH@/browser/chrome/webide@JAREXT@ |
55 |
@RESPATH@/browser/chrome/webide.manifest |
|
56 |
@RESPATH@/browser/@PREF_DIR@/webide-prefs.js |
|
| 766 | 57 |