diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/metaengine.h | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/metaengine.h')
| -rw-r--r-- | engines/metaengine.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/engines/metaengine.h b/engines/metaengine.h index 8eb8044b34..d9c1360042 100644 --- a/engines/metaengine.h +++ b/engines/metaengine.h @@ -224,9 +224,6 @@ typedef PluginSubclass<MetaEngine> EnginePlugin; * Singleton class which manages all Engine plugins. */ class EngineManager : public Common::Singleton<EngineManager> { -private: - friend class Common::Singleton<SingletonBaseType>; - public: GameDescriptor findGameInLoadedPlugins(const Common::String &gameName, const EnginePlugin **plugin = NULL) const; GameDescriptor findGame(const Common::String &gameName, const EnginePlugin **plugin = NULL) const; |