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

Conflicts: CMakeLists.txt main.cpp
2013-02-25 13:31:37 -06:00
parent 498225debd 4fd5bdb01b
commit 23474da175
25 changed files with 2196 additions and 22 deletions
--- a/libinstance/include/instance.h
+++ b/libinstance/include/instance.h
@ -305,4 +305,7 @@ private:
 	QString m_rootDir;
 };

+// pointer for lazy people
+typedef QSharedPointer<Instance> InstancePtr;
+
 #endif // INSTANCE_H