# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1351257587 -7200
# Node ID 9bb7e8277e151452126a2a2e4eb05f3e1da57045
# Parent  91ed72ab2b052e7d03140563c18321f23ecdb07b# Parent  f2ae23682353b69ed31ddf90dcad9af31317a47d
merge

diff -r 91ed72ab2b05 -r 9bb7e8277e15 CMakeLists.txt
--- a/CMakeLists.txt	Fri Oct 26 15:03:17 2012 +0200
+++ b/CMakeLists.txt	Fri Oct 26 15:19:47 2012 +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.2.3"
   )
 
 # Parameters of the build
diff -r 91ed72ab2b05 -r 9bb7e8277e15 OrthancExplorer/explorer.js
--- a/OrthancExplorer/explorer.js	Fri Oct 26 15:03:17 2012 +0200
+++ b/OrthancExplorer/explorer.js	Fri Oct 26 15:19:47 2012 +0200
@@ -325,7 +325,9 @@
     dataType: 'json',
     async: false,
     success: function(s) {
-      $('.orthanc-name').html('<a class="ui-link" href="explorer.html">' + s.Name + '</a> &raquo; ');
+      if (s.Name != "") {
+        $('.orthanc-name').html('<a class="ui-link" href="explorer.html">' + s.Name + '</a> &raquo; ');
+      }
     }
   });
 });
diff -r 91ed72ab2b05 -r 9bb7e8277e15 Resources/Configuration.json
--- a/Resources/Configuration.json	Fri Oct 26 15:03:17 2012 +0200
+++ b/Resources/Configuration.json	Fri Oct 26 15:19:47 2012 +0200
@@ -11,6 +11,7 @@
     "Name" : "MyOrthanc",
 
 
+
     /**
      * Configuration of the HTTP server
      **/