From 921cc59a236a0542b7286ecc4e0cf67e24397f92 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 6 Dec 2016 08:54:38 +0100 Subject: [PATCH] Update the OpenSpace version to 0.6.0 (AGU) Update Ghoul reference --- CREDITS | 11 ++++++----- ext/ghoul | 2 +- include/openspace/openspace.h | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CREDITS b/CREDITS index 1190a23a66..3bb64218eb 100644 --- a/CREDITS +++ b/CREDITS @@ -2,14 +2,15 @@ Alexander Bock Joakim Kilby Emil Axelsson Jonathas Costa -Niclas Hultberg -Michael Nilsson -Sebastian Piwell -Kalle Bladin -Erik Broberg +Matthew Territo Jonas Strandstedt Hans-Christian Helltegen Michal Marcinkowski Anton Arbring Tomas Forsyth Rosin +Kalle Bladin +Erik Broberg +Michael Nilsson +Sebastian Piwell +Niclas Hultberg diff --git a/ext/ghoul b/ext/ghoul index 722704f61d..d82c914bc3 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 722704f61d3750161936ebb41c36d96282e7f662 +Subproject commit d82c914bc32f494824bcef61ecd52e4cc36a1667 diff --git a/include/openspace/openspace.h b/include/openspace/openspace.h index 3fbdcf642e..be618923d2 100644 --- a/include/openspace/openspace.h +++ b/include/openspace/openspace.h @@ -32,10 +32,10 @@ namespace openspace { std::string licenseText(); const int OPENSPACE_VERSION_MAJOR = 0; -const int OPENSPACE_VERSION_MINOR = 5; +const int OPENSPACE_VERSION_MINOR = 6; const int OPENSPACE_VERSION_PATCH = 0; -const std::string OPENSPACE_VERSION_STRING = "prerelease-10 (Kulturnatten)"; +const std::string OPENSPACE_VERSION_STRING = "prerelease-11 (AGU)"; } // namespace openspace