changeset 1108:b53e058c2b08

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 07 Aug 2014 13:53:59 +0200
parents bec1eccf976c (current diff) fa818670b702 (diff)
children 2e3bfa9a82b7
files
diffstat 7 files changed, 22 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Thu Aug 07 11:33:46 2014 +0200
+++ b/CMakeLists.txt	Thu Aug 07 13:53:59 2014 +0200
@@ -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.8.2")
 
 
 #####################################################################
--- a/NEWS	Thu Aug 07 11:33:46 2014 +0200
+++ b/NEWS	Thu Aug 07 13:53:59 2014 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 0.8.2 (2014/08/07)
+==========================
+
 * Support of the standard text encodings
 * Hot restart of Orthanc by posting to "/tools/reset"
 * More fault-tolerant commands in Lua scripts
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Thu Aug 07 11:33:46 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Thu Aug 07 13:53:59 2014 +0200
@@ -1499,7 +1499,7 @@
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetCopyright()
   {
-    return "(c) 2012-2014, Sebastien Jodogne, CHU of Liege";
+    return "(c) 2012-2014, Sebastien Jodogne, University Hospital of Liege";
   }
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetVersion()
@@ -1509,12 +1509,12 @@
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion()
   {
-    return "0.8.0.1";
+    return "0.8.0.2";
   }
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion()
   {
-    return "0.8.1";
+    return "0.8.2";
   }
 
   LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Thu Aug 07 11:33:46 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Thu Aug 07 13:53:59 2014 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,8,0,1
+   FILEVERSION 0,8,0,2
    PRODUCTVERSION 0,8,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,12 +10,12 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.8.1"
+            VALUE "Comments", "Release 0.8.2"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.8.0.1"
+            VALUE "FileVersion", "0.8.0.2"
             VALUE "InternalName", "OrthancClient"
-            VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, CHU of Liege"
+            VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, University Hospital of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
             VALUE "OriginalFilename", "OrthancClient_Windows32.dll"
             VALUE "ProductName", "OrthancClient"
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Thu Aug 07 11:33:46 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Thu Aug 07 13:53:59 2014 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,8,0,1
+   FILEVERSION 0,8,0,2
    PRODUCTVERSION 0,8,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,12 +10,12 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.8.1"
+            VALUE "Comments", "Release 0.8.2"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.8.0.1"
+            VALUE "FileVersion", "0.8.0.2"
             VALUE "InternalName", "OrthancClient"
-            VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, CHU of Liege"
+            VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, University Hospital of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
             VALUE "OriginalFilename", "OrthancClient_Windows64.dll"
             VALUE "ProductName", "OrthancClient"
--- a/OrthancCppClient/SharedLibrary/Product.json	Thu Aug 07 11:33:46 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/Product.json	Thu Aug 07 13:53:59 2014 +0200
@@ -2,7 +2,7 @@
   "Product" : "OrthancClient",
   "Description" : "Native client to the REST API of Orthanc",
   "Company" : "CHU of Liege",
-  "Copyright" : "(c) 2012-2014, Sebastien Jodogne, CHU of Liege",
+  "Copyright" : "(c) 2012-2014, Sebastien Jodogne, University Hospital of Liege",
   "Legal" : "Licensing information is available on https://code.google.com/p/orthanc/",
-  "Version" : "0.8.1"
+  "Version" : "0.8.2"
 }
--- a/THANKS	Thu Aug 07 11:33:46 2014 +0200
+++ b/THANKS	Thu Aug 07 13:53:59 2014 +0200
@@ -8,8 +8,8 @@
 complete and exempt or errors.
 
 
-Code contributors
------------------
+Contributors
+------------
 
 * Cyril Paulus <cyril.paulus@student.ulg.ac.be>, for the build process
   and suggestions about the REST API.
@@ -20,6 +20,8 @@
 * 12maksqwe@gmail.com, for fixing issue #8.
 * Julien Nabet, for various suggestions to improve the source code.
 * Karsten Hilbert <Karsten.Hilbert@gmx.net>, for in-depth testing.
+* Marek Swiecicki <mswiecicki@archimedic.pl>, for various suggestions
+  and sample DICOM files.
 
 Thanks also to all the contributors active in our Google Group:
 https://groups.google.com/forum/#!forum/orthanc-users