comparison OrthancServer/OrthancRestApi/OrthancRestSystem.cpp @ 3160:fc9a4a2dad63

merge
author Alain Mazy <alain@mazy.be>
date Thu, 24 Jan 2019 10:55:19 +0100
parents ac72032d69a2
children 8ea7c4546c3a
comparison
equal deleted inserted replaced
3159:4cfed5c2eacd 3160:fc9a4a2dad63
32 32
33 33
34 #include "../PrecompiledHeadersServer.h" 34 #include "../PrecompiledHeadersServer.h"
35 #include "OrthancRestApi.h" 35 #include "OrthancRestApi.h"
36 36
37 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
38 #include "../../Plugins/Engine/OrthancPlugins.h"
39 #include "../../Plugins/Engine/PluginsManager.h"
37 #include "../OrthancConfiguration.h" 40 #include "../OrthancConfiguration.h"
38 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
39 #include "../../Plugins/Engine/PluginsManager.h"
40 #include "../../Plugins/Engine/OrthancPlugins.h"
41 #include "../ServerContext.h" 41 #include "../ServerContext.h"
42 42
43 43
44 namespace Orthanc 44 namespace Orthanc
45 { 45 {