Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 4 insertions, 3 deletions

diff --git a/src/executableslist.h b/src/executableslist.h
index b4054bcc..3d5ba0ed 100644
--- a/src/executableslist.h
+++ b/src/executableslist.h
@@ -20,13 +20,14 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef EXECUTABLESLIST_H

 #define EXECUTABLESLIST_H

 

+#include "executableinfo.h"

 

 #include <vector>

+

 #include <QFileInfo>

 #include <QMetaType>

-#include <gameinfo.h>

-#include <iplugingame.h>

 

+namespace MOBase { class IPluginGame; }

 

 /*!

  * @brief Information about an executable

@@ -78,7 +79,7 @@ public:
   /**

    * @brief initialise the list with the executables preconfigured for this game

    **/

-  void init(MOBase::IPluginGame *game);

+  void init(MOBase::IPluginGame const *game);

 

   /**

    * @brief find an executable by its name