Beta-3 Release Candidate branch (#753)

* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
This commit is contained in:
Alexander Bock
2018-11-05 20:51:48 -05:00
committed by GitHub
parent 7181de4673
commit 267879878b
27 changed files with 101 additions and 178 deletions
@@ -31,8 +31,7 @@ namespace openspace {
class ShortcutTopic : public Topic {
public:
ShortcutTopic();
virtual ~ShortcutTopic();
virtual ~ShortcutTopic() = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;
+1 -2
View File
@@ -31,8 +31,7 @@ namespace openspace {
class VersionTopic : public Topic {
public:
VersionTopic();
virtual ~VersionTopic();
virtual ~VersionTopic() = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;