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

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 44f46f4b..489f9145 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -280,15 +280,11 @@ private:
 

   int m_OldExecutableIndex;

 

-  QString m_GamePath;

-

   int m_ContextRow;

   QPersistentModelIndex m_ContextIdx;

   QTreeWidgetItem *m_ContextItem;

   QAction *m_ContextAction;

 

-  //int m_SelectedSaveGame;

-

   CategoryFactory &m_CategoryFactory;

 

   int m_ModsToUpdate;

@@ -352,6 +348,7 @@ private slots:
   void unendorse_clicked();

   void ignoreMissingData_clicked();

   void visitOnNexus_clicked();

+  void visitWebPage_clicked();

   void openExplorer_clicked();

   void information_clicked();

   // savegame context menu