Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

This commit is contained in:
Emil Axelsson
2017-12-17 18:30:00 +01:00
210 changed files with 5201 additions and 1299 deletions

View File

@@ -40,14 +40,14 @@
#include <memory>
namespace {
const char* _loggerCat = "HttpSynchronization";
const char* KeyIdentifier = "Identifier";
const char* KeyVersion = "Version";
constexpr const char* _loggerCat = "HttpSynchronization";
constexpr const char* KeyIdentifier = "Identifier";
constexpr const char* KeyVersion = "Version";
const char* QueryKeyIdentifier = "identifier";
const char* QueryKeyFileVersion = "file_version";
const char* QueryKeyApplicationVersion = "application_version";
const int ApplicationVersion = 1;
constexpr const char* QueryKeyIdentifier = "identifier";
constexpr const char* QueryKeyFileVersion = "file_version";
constexpr const char* QueryKeyApplicationVersion = "application_version";
constexpr const int ApplicationVersion = 1;
}
namespace openspace {