# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1483695932 -3600
# Node ID e062e6f1ed910ccf407d5385f3db6547d94cb9e3
# Parent  ba9cb920e67924129d9fb21c5702905a9d44d8b3# Parent  0d1cc4b1fbc1b6b8cc10beba0bf9e18ab03cc4a0
merge OrthancPostgreSQL-2.0

diff -r ba9cb920e679 -r e062e6f1ed91 CMakeLists.txt
diff -r ba9cb920e679 -r e062e6f1ed91 Orthanc/Resources/CMake/BoostConfiguration.cmake
diff -r ba9cb920e679 -r e062e6f1ed91 Orthanc/Resources/CMake/Compiler.cmake
diff -r ba9cb920e679 -r e062e6f1ed91 Orthanc/Resources/CMake/DownloadPackage.cmake
diff -r ba9cb920e679 -r e062e6f1ed91 Orthanc/Resources/CMake/GoogleTestConfiguration.cmake
diff -r ba9cb920e679 -r e062e6f1ed91 Orthanc/Resources/CMake/JsonCppConfiguration.cmake
diff -r ba9cb920e679 -r e062e6f1ed91 Orthanc/Resources/EmbedResources.py