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, 6 insertions, 4 deletions

diff --git a/src/executableslist.cpp b/src/executableslist.cpp
index 12e3d7aa..a4511ade 100644
--- a/src/executableslist.cpp
+++ b/src/executableslist.cpp
@@ -18,16 +18,18 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "executableslist.h"

-#include <gameinfo.h>

+

+#include "iplugingame.h"

+#include "utility.h"

+

 #include <QFileInfo>

 #include <QDir>

 #include <QDebug>

-#include "utility.h"

+

 #include <algorithm>

 

 

 using namespace MOBase;

-using namespace MOShared;

 

 

 ExecutablesList::ExecutablesList()

@@ -38,7 +40,7 @@ ExecutablesList::~ExecutablesList()
 {

 }

 

-void ExecutablesList::init(IPluginGame *game)

+void ExecutablesList::init(IPluginGame const *game)

 {

   Q_ASSERT(game != nullptr);

   m_Executables.clear();