# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1402493704 -7200
# Node ID b62fac89d61437644242ad0b945bb7c87d6f9a11
# Parent  e21d1a5f5934bed1a7b760163b39191243237d2e# Parent  a04fa8586114d2d9ca4e8931196b089b3d7158c7
back to mainline

diff -r e21d1a5f5934 -r b62fac89d614 CMakeLists.txt
--- a/CMakeLists.txt	Wed Jun 11 14:08:42 2014 +0200
+++ b/CMakeLists.txt	Wed Jun 11 15:35:04 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.7.6")
 
 
 #####################################################################
diff -r e21d1a5f5934 -r b62fac89d614 NEWS
--- a/NEWS	Wed Jun 11 14:08:42 2014 +0200
+++ b/NEWS	Wed Jun 11 15:35:04 2014 +0200
@@ -1,6 +1,11 @@
 Pending changes in the mainline
 ===============================
 
+
+
+Version 0.7.6 (2014/06/11)
+==========================
+
 * Support of JPEG and JPEG-LS decompression
 * Download DICOM images as Matlab/Octave arrays
 * Precompiled headers for Microsoft Visual Studio
diff -r e21d1a5f5934 -r b62fac89d614 OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Wed Jun 11 14:08:42 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Wed Jun 11 15:35:04 2014 +0200
@@ -1486,12 +1486,12 @@
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion()
   {
-    return "0.7.0.5";
+    return "0.7.0.6";
   }
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion()
   {
-    return "0.7.5";
+    return "0.7.6";
   }
 
   LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
diff -r e21d1a5f5934 -r b62fac89d614 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Wed Jun 11 14:08:42 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Wed Jun 11 15:35:04 2014 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,7,0,5
+   FILEVERSION 0,7,0,6
    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.5"
+            VALUE "Comments", "Release 0.7.6"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.7.0.5"
+            VALUE "FileVersion", "0.7.0.6"
             VALUE "InternalName", "OrthancClient"
             VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, CHU of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
diff -r e21d1a5f5934 -r b62fac89d614 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Wed Jun 11 14:08:42 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Wed Jun 11 15:35:04 2014 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,7,0,5
+   FILEVERSION 0,7,0,6
    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.5"
+            VALUE "Comments", "Release 0.7.6"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.7.0.5"
+            VALUE "FileVersion", "0.7.0.6"
             VALUE "InternalName", "OrthancClient"
             VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, CHU of Liege"
             VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
diff -r e21d1a5f5934 -r b62fac89d614 OrthancCppClient/SharedLibrary/Product.json
--- a/OrthancCppClient/SharedLibrary/Product.json	Wed Jun 11 14:08:42 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/Product.json	Wed Jun 11 15:35:04 2014 +0200
@@ -4,5 +4,5 @@
   "Company" : "CHU of Liege",
   "Copyright" : "(c) 2012-2014, Sebastien Jodogne, CHU of Liege",
   "Legal" : "Licensing information is available on https://code.google.com/p/orthanc/",
-  "Version" : "0.7.5"
+  "Version" : "0.7.6"
 }