diff options
| author | Silarn <jrim@rimpo.org> | 2019-01-18 01:56:16 -0600 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-01-18 01:56:16 -0600 |
| commit | 077a050e5954cc21ce40c45dd51973d636b3779b (patch) | |
| tree | 9e9ceea5e54acf65f560250e1aa842a60bb34b66 /src/organizer.pro | |
| parent | e35cdd6c89ea27dfb8f3ea1f918192514617a64d (diff) | |
| parent | 0d04ba18737385395d6ebcdfe49fb31bcb539038 (diff) | |
Merge remote-tracking branch 'origin/Develop' into archive_conflicts_2
Diffstat (limited to 'src/organizer.pro')
| -rw-r--r-- | src/organizer.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/organizer.pro b/src/organizer.pro index b8e79e0c..ddf676f2 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -92,7 +92,9 @@ SOURCES += \ modinfooverwrite.cpp \
modinfoforeign.cpp \
listdialog.cpp \
- lcdnumber.cpp
+ lcdnumber.cpp \
+ forcedloaddialog.cpp \
+ forcedloaddialogwidget.cpp
HEADERS += \
@@ -169,7 +171,9 @@ HEADERS += \ modinfooverwrite.h \
modinfoforeign.h \
listdialog.h \
- lcdnumber.h
+ lcdnumber.h \
+ forcedloaddialog.h \
+ forcedloaddialogwidget.h
FORMS += \
transfersavesdialog.ui \
@@ -197,7 +201,9 @@ FORMS += \ previewdialog.ui \
browserdialog.ui \
aboutdialog.ui \
- listdialog.ui
+ listdialog.ui \
+ forcedloaddialog.ui \
+ forcedloaddialogwidget.ui
RESOURCES += \
resources.qrc \
|