# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1591903637 -7200
# Node ID a36b2c684e59bf7169723d789d9a1656477e5993
# Parent  fbc5bfde6c957f56240c448a74789cf9cad8cbd0# Parent  5a6c76797b606b186f9289806332758367730992
merge

diff -r 5a6c76797b60 -r a36b2c684e59 Deprecated/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h
--- a/Deprecated/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h	Thu Jun 11 21:26:34 2020 +0200
+++ b/Deprecated/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h	Thu Jun 11 21:27:17 2020 +0200
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <string>
-#include <Framework/Messages/IObserver.h>
+#include "../../../../../../Framework/Messages/IObserver.h"
 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>
 
 #include "../../SimpleViewerApplication.h"
@@ -40,4 +40,4 @@
 
     };
 
-}
\ No newline at end of file
+}
diff -r 5a6c76797b60 -r a36b2c684e59 Deprecated/Platforms/Wasm/Defaults.cpp
--- a/Deprecated/Platforms/Wasm/Defaults.cpp	Thu Jun 11 21:26:34 2020 +0200
+++ b/Deprecated/Platforms/Wasm/Defaults.cpp	Thu Jun 11 21:27:17 2020 +0200
@@ -23,8 +23,8 @@
 
 #include "WasmWebService.h"
 #include "WasmDelayedCallExecutor.h"
-#include "../../Framework/Deprecated/Widgets/TestCairoWidget.h"
-#include <Framework/Deprecated/Viewport/WidgetViewport.h>
+#include "../../../Framework/Deprecated/Widgets/TestCairoWidget.h"
+#include "../../../Framework/Deprecated/Viewport/WidgetViewport.h"
 #include <Applications/Wasm/StartupParametersBuilder.h>
 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>
 #include <Framework/StoneInitialization.h>
diff -r 5a6c76797b60 -r a36b2c684e59 Deprecated/Platforms/Wasm/WasmPlatformApplicationAdapter.h
--- a/Deprecated/Platforms/Wasm/WasmPlatformApplicationAdapter.h	Thu Jun 11 21:26:34 2020 +0200
+++ b/Deprecated/Platforms/Wasm/WasmPlatformApplicationAdapter.h	Thu Jun 11 21:27:17 2020 +0200
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <string>
-#include <Framework/Messages/IObserver.h>
+#include "../../../Framework/Messages/IObserver.h"
 #include <Applications/IStoneApplication.h>
 
 namespace OrthancStone