summaryrefslogtreecommitdiffstats
path: root/logic/BaseInstance.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-06 01:13:20 +0100
committerSky <git@bunnies.cc>2013-10-06 01:13:20 +0100
commit7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c (patch)
tree53ea703d11a525442d6ebf575bd22f840c5b4e8d /logic/BaseInstance.cpp
parent2398acc9e490ce124aa621c19156c89ef87591f1 (diff)
parentf83119ce7ec3d11a903901b8eff762d2b0a9f635 (diff)
downloadMultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar
MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.gz
MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.lz
MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.xz
MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.zip
Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/BaseInstance.cpp')
-rw-r--r--logic/BaseInstance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index ec86596a..6a6b195b 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -132,7 +132,7 @@ InstanceList *BaseInstance::instList() const
return NULL;
}
-QSharedPointer<BaseVersionList> BaseInstance::versionList() const
+std::shared_ptr<BaseVersionList> BaseInstance::versionList() const
{
return MMC->minecraftlist();
}