diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2016-01-24 18:10:25 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2016-01-24 18:10:25 +0000 |
| commit | 0e9a86ebfc1a97742d0812a7b6ae8bb7f4662673 (patch) | |
| tree | f900f46ac4f14f8635533279bd434b06e6f3a94e /src/organizerproxy.cpp | |
| parent | e90fbb1df211513ee2176aee136fbc387750bbc2 (diff) | |
| parent | 8da9ba5404f51521b3425b6213e8139189dbca69 (diff) | |
Merge branch 'master' into issue/418
# Conflicts:
# SConstruct
# src/organizerproxy.cpp
Diffstat (limited to 'src/organizerproxy.cpp')
| -rw-r--r-- | src/organizerproxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index de1b6d03..b6dbd242 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -167,7 +167,7 @@ MOBase::IModList *OrganizerProxy::modList() const return m_Proxied->modList();
}
-IProfile *OrganizerProxy::profile() const
+MOBase::IProfile *OrganizerProxy::profile() const
{
return m_Proxied->currentProfile();
}
|