Merge pull request #1838 from STEllAR-GROUP/update_version_rc1

Update version rc1
STEllAR-GROUP · Nov 2, 2015 · e171910 · e171910
2 parents 343f41e + 61d5b79
commit e171910
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -304,8 +304,8 @@ hpx_quickbook_to_html(hpx
                 toc.max.depth=4
                 generate.section.toc.level=4
                 boost.image.src=${image}
-                boost.image.w=460
-                boost.image.h=106
+                boost.image.w=470
+                boost.image.h=123
                 boost.image.alt="HPX - High Performance ParalleX"
                 ${auto_index_xsl_param}
   QUICKBOOK_ARGS ${quickbook_fixme_mode} ${auto_index_mode}

diff --git a/docs/html/images/hpx_0_9_11.png b/docs/html/images/hpx_0_9_11.png
diff --git a/hpx/config/version.hpp b/hpx/config/version.hpp
@@ -38,7 +38,7 @@
     #define HPX_AGAS_VERSION 0x30
 #endif
 
-#define HPX_VERSION_TAG          "-trunk"
+#define HPX_VERSION_TAG          "-rc1"
 
 #if !defined(HPX_HAVE_GIT_COMMIT)
     #define HPX_HAVE_GIT_COMMIT  "unknown"