From 47d6fe3141990c59580c4feac0e7bab01e641c00 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 24 Feb 2015 21:31:39 +0100
Subject: [PATCH] Fix merging issues

---
 src/main.cpp                   | 2 +-
 src/rendering/renderengine.cpp | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 0912a84e4f..5906ce5dd0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
 #ifdef __APPLE__
 	sgct::Engine::RunMode rm = sgct::Engine::RunMode::OpenGL_4_1_Core_Profile;
 #else
-	sgct::Engine::RunMode rm = sgct::Engine::RunMode::OpenGL_4_2_Core_Profile;
+	sgct::Engine::RunMode rm = sgct::Engine::RunMode::OpenGL_4_3_Core_Profile;
 #endif
 	const bool initSuccess = _sgctEngine->init(rm);
     if (!initSuccess) {
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index c10243b8b6..2a2fb8dde3 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -1000,12 +1000,4 @@ void RenderEngine::setDisableRenderingOnMaster(bool enabled) {
     _disableMasterRendering = enabled;
 }
 
-void RenderEngine::setSGCTRenderStatistics(bool visible) {
-    _sgctRenderStatisticsVisible = visible;
-}
-
-void RenderEngine::setDisableRenderingOnMaster(bool enabled) {
-    _disableMasterRendering = enabled;
-}
-
 }// namespace openspace