mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to c75fbfd03652 (master) (#18090)

Browse source 
1532361
This commit is contained in:
Electron Bot 2019-05-01 16:42:49 -04:00 • committed by Jeremy Apthorp
parent dd3913fada
commit 61effac72a
16 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patches/common/chromium/resource_file_conflict.patch
View file

@ -52,7 +52,7 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 645bf391f2e7ffa9974c4cdfb0e323dc14cbf931..def59a7885004ee42b331f3af3241f4e6947b0c1 100644
index b51701cb23a746fa8c85dd308db40599ebb513c4..d40202886f0bafce384a13306de531845758eb1c 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1646,7 +1646,7 @@ if (is_chrome_branded && !is_android) {