# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1380898534 -7200
# Node ID 62091d13e289a7980a08108e53ab093fef0a611f
# Parent  f9991e8e66bff5c1aa3d642d89177d95ce7f55ad# Parent  11a195070841d18c255eceb993a001ee542e65cf
back to mainline

diff -r f9991e8e66bf -r 62091d13e289 CMakeLists.txt
--- a/CMakeLists.txt	Fri Oct 04 16:18:40 2013 +0200
+++ b/CMakeLists.txt	Fri Oct 04 16:55:34 2013 +0200
@@ -4,7 +4,7 @@
 
 # Version of the build, should always be "mainline" except in release branches
 add_definitions(
-  -DORTHANC_VERSION="mainline"
+  -DORTHANC_VERSION="0.6.2"
   )
 
 
diff -r f9991e8e66bf -r 62091d13e289 NEWS
--- a/NEWS	Fri Oct 04 16:18:40 2013 +0200
+++ b/NEWS	Fri Oct 04 16:55:34 2013 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 0.6.2 (2013/10/04)
+==========================
+
 * Build of the C++ client as a shared library
 * Improvements and documentation of the C++ client API
 * Fix of Debian bug #724947 (licensing issue with the SHA-1 library)
diff -r f9991e8e66bf -r 62091d13e289 OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Fri Oct 04 16:18:40 2013 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Fri Oct 04 16:55:34 2013 +0200
@@ -1440,12 +1440,12 @@
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion()
   {
-    return "0.6.0.1";
+    return "0.6.0.2";
   }
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion()
   {
-    return "0.6.1";
+    return "0.6.2";
   }
 
   LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
diff -r f9991e8e66bf -r 62091d13e289 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Fri Oct 04 16:18:40 2013 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Fri Oct 04 16:55:34 2013 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,6,0,1
+   FILEVERSION 0,6,0,2
    PRODUCTVERSION 0,6,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,10 +10,10 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.6.1"
+            VALUE "Comments", "Release 0.6.2"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.6.0.1"
+            VALUE "FileVersion", "0.6.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/"
diff -r f9991e8e66bf -r 62091d13e289 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Fri Oct 04 16:18:40 2013 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Fri Oct 04 16:55:34 2013 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,6,0,1
+   FILEVERSION 0,6,0,2
    PRODUCTVERSION 0,6,0,0
    FILEOS VOS_NT_WINDOWS32
    FILETYPE VFT_DLL
@@ -10,10 +10,10 @@
       BEGIN
          BLOCK "040904E4"
          BEGIN
-            VALUE "Comments", "Release 0.6.1"
+            VALUE "Comments", "Release 0.6.2"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.6.0.1"
+            VALUE "FileVersion", "0.6.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/"
diff -r f9991e8e66bf -r 62091d13e289 OrthancCppClient/SharedLibrary/Product.json
--- a/OrthancCppClient/SharedLibrary/Product.json	Fri Oct 04 16:18:40 2013 +0200
+++ b/OrthancCppClient/SharedLibrary/Product.json	Fri Oct 04 16:55:34 2013 +0200
@@ -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.6.1"
+  "Version" : "0.6.2"
 }