mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-10-08 13:57:47 -04:00
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts: CMakeLists.txt main.cpp
This commit is contained in:
commit
23474da175
25 files changed
+2196
-22
No files matched your search
@@ -305,4 +305,7 @@ private:
|
||||
QString m_rootDir;
|
||||
};
|
||||
|
||||
// pointer for lazy people
|
||||
typedef QSharedPointer<Instance> InstancePtr;
|
||||
|
||||
#endif // INSTANCE_H
|
||||
Reference in new issue
Block a user