# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1415113760 -3600
# Node ID f38b09e9afed1a85404f66f26f791ec32b17724b
# Parent  787059de6b9ad9ff4222e1fb10722fb4ea9f7b6a# Parent  c416fe3e8022058ee18918f70fa9d4bd5f53b273
back to mainline

diff -r 787059de6b9a -r f38b09e9afed CMakeLists.txt
--- a/CMakeLists.txt	Tue Nov 04 14:39:13 2014 +0100
+++ b/CMakeLists.txt	Tue Nov 04 16:09:20 2014 +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.8.5")
 
 
 #####################################################################
diff -r 787059de6b9a -r f38b09e9afed NEWS
--- a/NEWS	Tue Nov 04 14:39:13 2014 +0100
+++ b/NEWS	Tue Nov 04 16:09:20 2014 +0100
@@ -1,6 +1,11 @@
 Pending changes in the mainline
 ===============================
 
+
+
+Version 0.8.5 (2014/11/04)
+==========================
+
 General
 -------
 
diff -r 787059de6b9a -r f38b09e9afed OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Tue Nov 04 14:39:13 2014 +0100
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Tue Nov 04 16:09:20 2014 +0100
@@ -1509,12 +1509,12 @@
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion()
   {
-    return "0.8.0.4";
+    return "0.8.0.5";
   }
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion()
   {
-    return "0.8.4";
+    return "0.8.5";
   }
 
   LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
diff -r 787059de6b9a -r f38b09e9afed OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Tue Nov 04 14:39:13 2014 +0100
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Tue Nov 04 16:09:20 2014 +0100
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,8,0,4
+   FILEVERSION 0,8,0,5
    PRODUCTVERSION 0,8,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,10 +10,10 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.8.4"
+            VALUE "Comments", "Release 0.8.5"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.8.0.4"
+            VALUE "FileVersion", "0.8.0.5"
             VALUE "InternalName", "OrthancClient"
             VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, University Hospital of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
diff -r 787059de6b9a -r f38b09e9afed OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Tue Nov 04 14:39:13 2014 +0100
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Tue Nov 04 16:09:20 2014 +0100
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,8,0,4
+   FILEVERSION 0,8,0,5
    PRODUCTVERSION 0,8,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,10 +10,10 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.8.4"
+            VALUE "Comments", "Release 0.8.5"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.8.0.4"
+            VALUE "FileVersion", "0.8.0.5"
             VALUE "InternalName", "OrthancClient"
             VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, University Hospital of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
diff -r 787059de6b9a -r f38b09e9afed OrthancCppClient/SharedLibrary/Product.json
--- a/OrthancCppClient/SharedLibrary/Product.json	Tue Nov 04 14:39:13 2014 +0100
+++ b/OrthancCppClient/SharedLibrary/Product.json	Tue Nov 04 16:09:20 2014 +0100
@@ -4,5 +4,5 @@
   "Company" : "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.4"
+  "Version" : "0.8.5"
 }