wait #4776 @0.5

diff --git a/desktop/windows-installer/Fluidbook-Workshop.exe b/desktop/windows-installer/Fluidbook-Workshop.exe
index d8dd23b5c34c1a73bb83bdb1fa1da7b544738dfb..0307c7d984b02df5a6f00c0210e18b0db4431007 100644 (file)
Binary files a/desktop/windows-installer/Fluidbook-Workshop.exe and b/desktop/windows-installer/Fluidbook-Workshop.exe differ

diff --git a/desktop/windows/workshop/windows-x32/libEGL.dll b/desktop/windows/workshop/windows-x32/libEGL.dll
index bc36f6bd3b6ce5ef0ef86d41fe9f3d356be158cd..b5b81b06af6b00a48775919361dbb5cb96e8d6a9 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/libEGL.dll and b/desktop/windows/workshop/windows-x32/libEGL.dll differ

diff --git a/desktop/windows/workshop/windows-x32/libGLESv2.dll b/desktop/windows/workshop/windows-x32/libGLESv2.dll
index d15af70604ceee9688aa3dad158ac09a88e5712d..b2bfb9da0b33fdb8957825d661860821064aa97f 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/libGLESv2.dll and b/desktop/windows/workshop/windows-x32/libGLESv2.dll differ

diff --git a/desktop/windows/workshop/windows-x32/node.dll b/desktop/windows/workshop/windows-x32/node.dll
index ef0af847530059cdf2ad445b8d7793a873f4806b..cf5bc2fd47aa6085c86cdcaee7fd664665bf2908 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/node.dll and b/desktop/windows/workshop/windows-x32/node.dll differ

diff --git a/desktop/windows/workshop/windows-x32/notification_helper.exe b/desktop/windows/workshop/windows-x32/notification_helper.exe
index 6fad87dc946739ce5bd2dfeb040bec999bbfb939..9528f74d4f714fba9102fa040c5f4dd12abc0200 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/notification_helper.exe and b/desktop/windows/workshop/windows-x32/notification_helper.exe differ

diff --git a/desktop/windows/workshop/windows-x32/nw.dll b/desktop/windows/workshop/windows-x32/nw.dll
index d3c5b6dd7b53e5790922a376b00bc7af47c882ca..821b8da24fc301aa0b4b00d6a7796fd6d972f842 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/nw.dll and b/desktop/windows/workshop/windows-x32/nw.dll differ

diff --git a/desktop/windows/workshop/windows-x32/nw_elf.dll b/desktop/windows/workshop/windows-x32/nw_elf.dll
index 21aaa072dfab437aabc87f328e4e55a36e5df35a..fa4d2350f35486836b4c66eb3887fcd48756c5ff 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/nw_elf.dll and b/desktop/windows/workshop/windows-x32/nw_elf.dll differ

diff --git a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns
index 5f5ddb814cf085dd995e317745a73dab8dbbc7f8..6811cfdb3b211efc71e56a6b314b282449be45b7 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns and b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns differ

diff --git a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico
index fdaa6af8d87a245a546d53da08ae7beb88d13144..256e978ac75f695a7dfb340326aa48588ee86c08 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico and b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico differ

diff --git a/desktop/windows/workshop/windows-x32/package.nw/main.js b/desktop/windows/workshop/windows-x32/package.nw/main.js
index a5290a5a599f598188c83ac3f0edfd5b9cd4faab..00c63a8b65f42dfc84a85b5642620497911c4c8a 100644 (file)
--- a/desktop/windows/workshop/windows-x32/package.nw/main.js
+++ b/desktop/windows/workshop/windows-x32/package.nw/main.js
@@ -3,7 +3,6 @@ if (nw.App.argv.length >= 1 && nw.App.argv[0].indexOf('https://workshop.fluidboo
     url = nw.App.argv[0];\r
 }\r
 var win = nw.Window.open(url, {}, function (win) {\r
-    win.window.nw=nw;\r
 });\r
 \r
 try {\r

diff --git a/desktop/windows/workshop/windows-x32/resources.pak b/desktop/windows/workshop/windows-x32/resources.pak
index e91e2c59173956058add990aac5388f0dce86f78..52ede4c06cde20e123753e2881a1e36007bc2bd6 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/resources.pak and b/desktop/windows/workshop/windows-x32/resources.pak differ

diff --git a/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll b/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll
index 2603e5c077618ab94f5861e462f08607ec029012..377cd46653c72f408ca83d5234f4ff6dbb0b63e2 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll and b/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll differ

diff --git a/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll b/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll
index 203d1b21e5048df071b997bb4ad29cd0246dd625..080358353ef1b3d95d66f86c6f8ad051dde437be 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll and b/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll differ

diff --git a/desktop/windows/workshop/windows-x32/workshop.exe b/desktop/windows/workshop/windows-x32/workshop.exe
index c1aa9ded11b7298cc0a246f732bf440b8a2a6903..58fdaa9b9db2c0ca519daf1183b8a0aad9d90a53 100644 (file)
Binary files a/desktop/windows/workshop/windows-x32/workshop.exe and b/desktop/windows/workshop/windows-x32/workshop.exe differ

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index ba11026f55c8d3a181733956d3a900734ed76d05..33470b80d3bdfbe64efece845f0961343dae2f32 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1408,12 +1408,11 @@ class wsMaintenance
         if ($platform === 'windows') {
             $p = 'windows-x32';
             $exe = 'workshop';
-            $version = '0.50.2';
         } else if ($platform === 'mac') {
             $p = 'mac-x64';
             $exe = 'Fluidbook Workshop';
-            $version = '0.50.2';
         }
+        $version = '0.50.2';
 
         $path = ROOT . '/desktop';
         $outpath = $path . '/' . $platform;