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, 14 insertions, 2 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 313f7506..c55f9efe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,6 +35,11 @@ SET(organizer_SRCS
     modlist.cpp
     modinfodialog.cpp
     modinfo.cpp
+	modinfobackup.cpp
+	modinfoforeign.cpp
+	modinfooverwrite.cpp
+	modinforegular.cpp
+	modinfowithconflictinfo.cpp
     messagedialog.cpp
     mainwindow.cpp
     main.cpp
@@ -61,7 +66,6 @@ SET(organizer_SRCS
     moapplication.cpp
     profileinputdialog.cpp
     icondelegate.cpp
-    gameinfoimpl.cpp
     csvbuilder.cpp
     savetextasdialog.cpp
     qtgroupingproxy.cpp
@@ -127,6 +131,11 @@ SET(organizer_HDRS
     modlist.h
     modinfodialog.h
     modinfo.h
+	modinfobackup.h
+	modinfoforeign.h
+	modinfooverwrite.h
+	modinforegular.h
+	modinfowithconflictinfo.h
     messagedialog.h
     mainwindow.h
     loghighlighter.h
@@ -152,7 +161,6 @@ SET(organizer_HDRS
     moapplication.h
     profileinputdialog.h
     icondelegate.h
-    gameinfoimpl.h
     csvbuilder.h
     savetextasdialog.h
     qtgroupingproxy.h
@@ -284,8 +292,12 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/esptk/src
                     ${project_path}/archive/src
                     ${project_path}/../usvfs/usvfs
+                    ${project_path}/game_gamebryo/src
                     ${project_path}/game_features/src)
 
+MESSAGE(STATUS ${project_path}/gameGamebryo/src)
+
+
 INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
 LINK_DIRECTORIES(${lib_path}
                  ${project_path}/../zlib/lib)