Merge with branch1.2

1 files changed, 2 insertions, 2 deletions

diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h
index 7544e5ce..cb506c01 100644
--- a/src/shared/oblivioninfo.h
+++ b/src/shared/oblivioninfo.h
@@ -84,13 +84,13 @@ public:
 

   // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

   // the game directory

-  virtual std::vector<ExecutableInfo> getExecutables();

+  //virtual std::vector<ExecutableInfo> getExecutables();

 

   virtual std::wstring archiveListKey() { return L"SArchiveList"; }

 

 private:

 

-  OblivionInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory);

+  OblivionInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

 

   static bool identifyGame(const std::wstring &searchPath);