mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-27 22:49:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/NewAtmosphere

Browse Source
This commit is contained in:
Jonathas Costa
2016-10-11 16:48:09 -04:00
parent 6b162c3ee4 e21b69cab8
commit 8e41a071cf
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/openspace/engine/configurationmanager.h
View File

@@ -109,15 +109,15 @@ public:
/// The key that stores the http proxy settings for the downloadmanager
static const std::string KeyHttpProxy;
/// The key that stores the address of the http proxy
static const std::string ConfigurationManager::PartHttpProxyAddress;
static const std::string PartHttpProxyAddress;
/// The key that stores the port of the http proxy
static const std::string ConfigurationManager::PartHttpProxyPort;
static const std::string PartHttpProxyPort;
/// The key that stores the authentication method of the http proxy
static const std::string ConfigurationManager::PartHttpProxyAuthentication;
static const std::string PartHttpProxyAuthentication;
/// The key that stores the username to use for authentication to access the http proxy
static const std::string ConfigurationManager::PartHttpProxyUser;
static const std::string PartHttpProxyUser;
/// The key that stores the password to use for authentication to access the http proxy
static const std::string ConfigurationManager::PartHttpProxyPassword;
static const std::string PartHttpProxyPassword;
/**

1
src/rendering/renderengine.cpp
View File

@@ -83,7 +83,6 @@
#include <array>
#include <fstream>
#include <sgct.h>
#include <stack>
// ABuffer defines