Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 0 insertions, 30 deletions

diff --git a/depends/settings/src/overridesetting.cpp b/depends/settings/src/overridesetting.cpp
deleted file mode 100644
index 5b10920d..00000000
--- a/depends/settings/src/overridesetting.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "include/overridesetting.h"
-
-OverrideSetting::OverrideSetting(const QString &name, Setting *other, QObject *parent)
-	: Setting(name, QVariant(), parent)
-{
-	m_other = other;
-}
-
-QVariant OverrideSetting::defValue() const
-{
-	if (m_other)
-		return m_other->get();
-	else
-		return QVariant();
-}