Skip to content
Snippets Groups Projects
Commit deaff2a1 authored by Loïc Correnson's avatar Loïc Correnson
Browse files

Merge branch 'fix/ivette/icon' into 'master'

Corriger l'icone Frama-C dans Ivette

Closes #1399

See merge request frama-c/frama-c!4603
parents e66605a4 ed2b0e25
No related branches found
No related tags found
No related merge requests found
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
] ]
} }
], ],
"icon": "static/icon256.png", "icon": "static/icon.png",
"legalTrademarks": "LGPL-2.1" "legalTrademarks": "LGPL-2.1"
}, },
"linux": { "linux": {
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
"category": "Profiling" "category": "Profiling"
}, },
"mac": { "mac": {
"icon": "static/icon512.png", "icon": "static/icon.png",
"identity": null, "identity": null,
"mergeASARs": true, "mergeASARs": true,
"target": [ "target": [
......
...@@ -406,7 +406,7 @@ function createBrowserWindow( ...@@ -406,7 +406,7 @@ function createBrowserWindow(
height: 670, height: 670,
show: false, show: false,
backgroundColor: '#f0f0f0', backgroundColor: '#f0f0f0',
icon: path.join(__dirname, 'icon.png'), icon: path.join(__dirname, '../../static/icon.png'),
webPreferences: { webPreferences: {
contextIsolation: false, contextIsolation: false,
nodeIntegration: true, nodeIntegration: true,
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment