changeset 670:4b1f8fbea908

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Nov 2013 16:28:45 +0100
parents aa2ab67d913d (current diff) 2d59a8b9bb84 (diff)
children 7131193b0e4b
files
diffstat 6 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Nov 08 16:02:14 2013 +0100
+++ b/CMakeLists.txt	Fri Nov 08 16:28:45 2013 +0100
@@ -3,7 +3,7 @@
 project(Orthanc)
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "0.7.2")
 
 
 #####################################################################
--- a/NEWS	Fri Nov 08 16:02:14 2013 +0100
+++ b/NEWS	Fri Nov 08 16:28:45 2013 +0100
@@ -2,6 +2,10 @@
 ===============================
 
 
+
+Version 0.7.2 (2013/11/08)
+==========================
+
 * Support of Query/Retrieve from medInria
 * Accept more transfer syntaxes for C-Store SCP and SCU (notably JPEG)
 * Create the meta-header when receiving files through C-Store SCP
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Fri Nov 08 16:02:14 2013 +0100
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Fri Nov 08 16:28:45 2013 +0100
@@ -1440,12 +1440,12 @@
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion()
   {
-    return "0.7.0.1";
+    return "0.7.0.2";
   }
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion()
   {
-    return "0.7.1";
+    return "0.7.2";
   }
 
   LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Fri Nov 08 16:02:14 2013 +0100
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Fri Nov 08 16:28:45 2013 +0100
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,7,0,1
+   FILEVERSION 0,7,0,2
    PRODUCTVERSION 0,7,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,10 +10,10 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.7.1"
+            VALUE "Comments", "Release 0.7.2"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.7.0.1"
+            VALUE "FileVersion", "0.7.0.2"
             VALUE "InternalName", "OrthancClient"
             VALUE "LegalCopyright", "(c) 2012-2013, Sebastien Jodogne, CHU of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Fri Nov 08 16:02:14 2013 +0100
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Fri Nov 08 16:28:45 2013 +0100
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,7,0,1
+   FILEVERSION 0,7,0,2
    PRODUCTVERSION 0,7,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,10 +10,10 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.7.1"
+            VALUE "Comments", "Release 0.7.2"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.7.0.1"
+            VALUE "FileVersion", "0.7.0.2"
             VALUE "InternalName", "OrthancClient"
             VALUE "LegalCopyright", "(c) 2012-2013, Sebastien Jodogne, CHU of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
--- a/OrthancCppClient/SharedLibrary/Product.json	Fri Nov 08 16:02:14 2013 +0100
+++ b/OrthancCppClient/SharedLibrary/Product.json	Fri Nov 08 16:28:45 2013 +0100
@@ -4,5 +4,5 @@
   "Company" : "CHU of Liege",
   "Copyright" : "(c) 2012-2013, Sebastien Jodogne, CHU of Liege",
   "Legal" : "Licensing information is available on https://code.google.com/p/orthanc/",
-  "Version" : "0.7.1"
+  "Version" : "0.7.2"
 }