Merge branch 'master' of http://github.com/peterix/MultiMC5

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp

1 files changed, 32 insertions, 0 deletions

diff --git a/libinstance/src/instversion.cpp b/libinstance/src/instversion.cpp
new file mode 100644
index 00000000..cedb61df
--- /dev/null
+++ b/libinstance/src/instversion.cpp
@@ -0,0 +1,32 @@
+/* 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/instversion.h"
+#include "include/instversionlist.h"
+
+InstVersion::InstVersion(InstVersionList *parent) :
+	QObject(parent)
+{
+	
+}
+
+InstVersionList *InstVersion::versionList() const
+{
+	// Parent should *always* be an InstVersionList
+	if (!parent() || !parent()->inherits("InstVersionList"))
+		return NULL;
+	else
+		return (InstVersionList *)parent();
+}