mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-06-29 09:59:59 +03:00
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts: CMakeLists.txt main.cpp
This commit is contained in:
commit
23474da175
25 changed files with 2196 additions and 22 deletions
|
|
@ -305,4 +305,7 @@ private:
|
|||
QString m_rootDir;
|
||||
};
|
||||
|
||||
// pointer for lazy people
|
||||
typedef QSharedPointer<Instance> InstancePtr;
|
||||
|
||||
#endif // INSTANCE_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue