# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1648054299 -3600
# Node ID c76eb3cedcf0c9a1ce7457354b827873568b1938
# Parent  29bcc3f47f2aa6e5d97fbce281c35286139f9e5b# Parent  7ae27bc1f4bb6ec01cb99e11c778a8ae786f8c5c
back to mainline

diff -r 7ae27bc1f4bb -r c76eb3cedcf0 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Mar 23 16:37:45 2022 +0100
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Mar 23 17:51:39 2022 +0100
@@ -144,6 +144,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "c912bbb860d640d3ae3003b5c9698205")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.10.0")
         set(ORTHANC_FRAMEWORK_MD5 "8610c82d9153f22e929f2110f8f60279")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.10.1")
+        set(ORTHANC_FRAMEWORK_MD5 "caf667fc5ea452b3d0c2f70bfd02599c")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 7ae27bc1f4bb -r c76eb3cedcf0 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Mar 23 16:37:45 2022 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Mar 23 17:51:39 2022 +0100
@@ -24,7 +24,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.10.1")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r 7ae27bc1f4bb -r c76eb3cedcf0 OrthancFramework/Resources/WindowsResources.rc
--- a/OrthancFramework/Resources/WindowsResources.rc	Wed Mar 23 16:37:45 2022 +0100
+++ b/OrthancFramework/Resources/WindowsResources.rc	Wed Mar 23 17:51:39 2022 +0100
@@ -11,7 +11,7 @@
          BLOCK "${BLOCK}"
          BEGIN
             VALUE "Comments", "${RELEASE}"
-            VALUE "CompanyName", "Osimis SA, Belgium"
+            VALUE "CompanyName", "The Orthanc project"
             VALUE "FileDescription", "${DESCRIPTION}"
             VALUE "FileVersion", "${VERSION_MAJOR}.${VERSION_MINOR}.0.${VERSION_PATCH}"
             VALUE "InternalName", "${PRODUCT}"