mirror of
https://github.com/zen-browser/desktop.git
synced 2026-08-27 08:51:32 +00:00
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
@@ -1,8 +1,18 @@
|
||||
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
||||
index 70f268914f1078ef45e86d295f4bb2ce179a05e0..9eb138023bc9de6211a3e814b0525da612156a78 100644
|
||||
index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644
|
||||
--- a/browser/installer/package-manifest.in
|
||||
+++ b/browser/installer/package-manifest.in
|
||||
@@ -369,9 +369,9 @@ bin/libfreebl_64int_3.so
|
||||
@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so
|
||||
; [MaintenanceService]
|
||||
;
|
||||
#ifdef MOZ_MAINTENANCE_SERVICE
|
||||
-@BINPATH@/maintenanceservice.exe
|
||||
-@BINPATH@/maintenanceservice_installer.exe
|
||||
+;@BINPATH@/maintenanceservice.exe
|
||||
+;@BINPATH@/maintenanceservice_installer.exe
|
||||
#endif
|
||||
|
||||
; [Crash Reporter]
|
||||
;
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
#ifdef XP_MACOSX
|
||||
|
||||
@@ -661,7 +661,7 @@ var gZenCompactModeManager = {
|
||||
requestAnimationFrame(() => {
|
||||
delete this._hasHoveredUrlbar;
|
||||
});
|
||||
}, 0);
|
||||
}, 10);
|
||||
}, 0);
|
||||
});
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user