Conflicts:
src/mdictionary/mdictionary.pro
gui/SpinBox.cpp \
gui/DictTypeModel.cpp \
gui/DictManagerModel.cpp \
- gui/HistoryListModel.cpp
++ gui/HistoryListModel.cpp \
+ gui/WordListModel.cpp
HEADERS += gui/MainWindow.h \
backbone/ConfigGenerator.h \
../include/CommonDictInterface.h \
gui/MenuWidget.h \
gui/MenuTabWidget.h \
-- gui/DictManagerWidget.h \
++
gui/DictTypeSelectDialog.h \
../include/History.h \
gui/HistoryListDialog.h \
gui/SpinBox.h \
gui/DictTypeModel.h \
gui/DictManagerModel.h \
- gui/HistoryListModel.h
++ gui/HistoryListModel.h \
+ gui/WordListModel.h
RESOURCES += ../../data/gui.qrc