mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
d6e0c270d1
* chore: bump chromium in DEPS to 147.0.7724.0 * chore: bump chromium in DEPS to 147.0.7725.0 * chore: bump chromium in DEPS to 147.0.7727.0 * chore: update patches Refs https://chromium-review.googlesource.com/c/chromium/src/+/7633903 * fix: pass weak-ptr-bound callback to OnCommandsChanged Refs https://chromium-review.googlesource.com/c/chromium/src/+/7622614 * fix: add missing option to CSS corner smoothing property Refs https://chromium-review.googlesource.com/c/chromium/src/+/7646628 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org>
24 lines
790 B
Diff
24 lines
790 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 18 Oct 2018 17:07:17 -0700
|
|
Subject: gritsettings_resource_ids.patch
|
|
|
|
Add electron resources file to the list of resource ids generation.
|
|
|
|
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
|
index bb7dc253bbc1a9e8b194bc55de59bd4e6b7aecc4..4e7e4568cc12bcd7d5a126b3a32cf8373452c9f9 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1657,6 +1657,11 @@
|
|
"includes": [12000],
|
|
},
|
|
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ }
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|