# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1523456913 -7200
# Node ID aa6162ad4ba7823c864b84e3dd88e9fe20839188
# Parent  db70f6c5fa4fb07431e84f5f43ff60a62100d4c7# Parent  8a6861f2b0be669ab16db242edd8b7688c197324
merge

diff -r db70f6c5fa4f -r aa6162ad4ba7 Resources/Orthanc/NEWS
diff -r db70f6c5fa4f -r aa6162ad4ba7 Resources/Orthanc/Resources/CMake/BoostConfiguration.cmake
diff -r db70f6c5fa4f -r aa6162ad4ba7 Resources/Orthanc/Resources/CMake/OrthancFrameworkConfiguration.cmake