diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 12:49:12 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 12:49:12 +0000 |
| commit | c2ed844eeb2d213a72c405eb47e077da00f084fe (patch) | |
| tree | 647441b712dbe79caacf385395b04fd8ee94b66c /src/organizer.pro | |
| parent | c07e48075e86c855f147e084a50ee1c7f0c00e40 (diff) | |
| parent | 688e149c96c29d8249c9db416f5773cfc7baad6d (diff) | |
Merge remote-tracking branch 'remotes/TanninOne/master' into issue/356
Conflicts:
src/downloadmanager.cpp
src/mainwindow.cpp
src/modinfo.cpp
src/modinfo.h
src/selfupdater.cpp
src/shared/fallout3info.cpp
src/shared/fallout3info.h
src/shared/falloutnvinfo.cpp
src/shared/falloutnvinfo.h
src/shared/gameinfo.h
src/shared/oblivioninfo.cpp
src/shared/oblivioninfo.h
src/shared/skyriminfo.cpp
src/shared/skyriminfo.h
Diffstat (limited to 'src/organizer.pro')
| -rw-r--r-- | src/organizer.pro | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/organizer.pro b/src/organizer.pro index f472bd80..0cdb4400 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -90,7 +90,12 @@ SOURCES += \ organizerproxy.cpp \
viewmarkingscrollbar.cpp \
plugincontainer.cpp \
- organizercore.cpp
+ organizercore.cpp \
+ modinfowithconflictinfo.cpp \
+ modinforegular.cpp \
+ modinfobackup.cpp \
+ modinfooverwrite.cpp \
+ modinfoforeign.cpp
HEADERS += \
@@ -165,7 +170,12 @@ HEADERS += \ viewmarkingscrollbar.h \
plugincontainer.h \
organizercore.h \
- iuserinterface.h
+ iuserinterface.h \
+ modinfowithconflictinfo.h \
+ modinforegular.h \
+ modinfobackup.h \
+ modinfooverwrite.h \
+ modinfoforeign.h
FORMS += \
transfersavesdialog.ui \
|