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

Conflicts:
	CMakeLists.txt
	main.cpp
This commit is contained in:
Andrew committed 2013-02-25 13:31:37 -06:00
commit 23474da175
25 files changed
+2196 -22

No files matched your search

+3
View File
@@ -305,4 +305,7 @@ private:
QString m_rootDir;
};
// pointer for lazy people
typedef QSharedPointer<Instance> InstancePtr;
#endif // INSTANCE_H