# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1411118027 -7200
# Node ID 6467a3fa72a26705dfd4ae5b4b77fa58d336a01f
# Parent  a921e3b5e7630bd34307a94536c04b4d80904201# Parent  2ee4e8f21c74960556afbab6f39bcfb0d89af00d
back to mainline

diff -r a921e3b5e763 -r 6467a3fa72a2 CMakeLists.txt
--- a/CMakeLists.txt	Fri Sep 19 10:17:50 2014 +0200
+++ b/CMakeLists.txt	Fri Sep 19 11:13:47 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.4")
 
 
 #####################################################################
diff -r a921e3b5e763 -r 6467a3fa72a2 NEWS
--- a/NEWS	Fri Sep 19 10:17:50 2014 +0200
+++ b/NEWS	Fri Sep 19 11:13:47 2014 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 0.8.4 (2014/09/19)
+==========================
+
 * "/instances-tags" to get the tags of all the child instances of a
   patient/study/series with a single REST call (bulk tags retrieval)
 * Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
diff -r a921e3b5e763 -r 6467a3fa72a2 OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Fri Sep 19 10:17:50 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp	Fri Sep 19 11:13:47 2014 +0200
@@ -1509,12 +1509,12 @@
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion()
   {
-    return "0.8.0.3";
+    return "0.8.0.4";
   }
 
   LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion()
   {
-    return "0.8.3";
+    return "0.8.4";
   }
 
   LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
diff -r a921e3b5e763 -r 6467a3fa72a2 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Fri Sep 19 10:17:50 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc	Fri Sep 19 11:13:47 2014 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,8,0,3
+   FILEVERSION 0,8,0,4
    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.3"
+            VALUE "Comments", "Release 0.8.4"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.8.0.3"
+            VALUE "FileVersion", "0.8.0.4"
             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 a921e3b5e763 -r 6467a3fa72a2 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Fri Sep 19 10:17:50 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc	Fri Sep 19 11:13:47 2014 +0200
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION 0,8,0,3
+   FILEVERSION 0,8,0,4
    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.3"
+            VALUE "Comments", "Release 0.8.4"
             VALUE "CompanyName", "CHU of Liege"
             VALUE "FileDescription", "Native client to the REST API of Orthanc"
-            VALUE "FileVersion", "0.8.0.3"
+            VALUE "FileVersion", "0.8.0.4"
             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 a921e3b5e763 -r 6467a3fa72a2 OrthancCppClient/SharedLibrary/Product.json
--- a/OrthancCppClient/SharedLibrary/Product.json	Fri Sep 19 10:17:50 2014 +0200
+++ b/OrthancCppClient/SharedLibrary/Product.json	Fri Sep 19 11:13:47 2014 +0200
@@ -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.3"
+  "Version" : "0.8.4"
 }