Mercurial > hg > orthanc
changeset 756:84501a25ee61
back to mainline
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 16 Apr 2014 12:12:42 +0200 |
parents | a6576b478553 (current diff) 584b59a80ffb (diff) |
children | 40d09221077a |
files | |
diffstat | 6 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Apr 16 11:00:01 2014 +0200 +++ b/CMakeLists.txt Wed Apr 16 12:12:42 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.4") #####################################################################
--- a/NEWS Wed Apr 16 11:00:01 2014 +0200 +++ b/NEWS Wed Apr 16 12:12:42 2014 +0200 @@ -1,6 +1,11 @@ Pending changes in the mainline =============================== + + +Version 0.7.4 (2014/04/16) +========================== + * Switch to openssl-1.0.1g in static builds (cf. Heartbleed exploit) * Switch to boost 1.55.0 in static builds (to solve compiling errors) * Better logging about nonexistent tags
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp Wed Apr 16 11:00:01 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp Wed Apr 16 12:12:42 2014 +0200 @@ -1486,12 +1486,12 @@ LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion() { - return "0.7.0.3"; + return "0.7.0.4"; } LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion() { - return "0.7.3"; + return "0.7.4"; } LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc Wed Apr 16 11:00:01 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc Wed Apr 16 12:12:42 2014 +0200 @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,0,3 + FILEVERSION 0,7,0,4 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.3" + VALUE "Comments", "Release 0.7.4" VALUE "CompanyName", "CHU of Liege" VALUE "FileDescription", "Native client to the REST API of Orthanc" - VALUE "FileVersion", "0.7.0.3" + VALUE "FileVersion", "0.7.0.4" 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/"
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc Wed Apr 16 11:00:01 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc Wed Apr 16 12:12:42 2014 +0200 @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,0,3 + FILEVERSION 0,7,0,4 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.3" + VALUE "Comments", "Release 0.7.4" VALUE "CompanyName", "CHU of Liege" VALUE "FileDescription", "Native client to the REST API of Orthanc" - VALUE "FileVersion", "0.7.0.3" + VALUE "FileVersion", "0.7.0.4" 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/"
--- a/OrthancCppClient/SharedLibrary/Product.json Wed Apr 16 11:00:01 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/Product.json Wed Apr 16 12:12:42 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.3" + "Version" : "0.7.4" }