Conflicts:
trunk/src/base/base.pro
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
gui/HistoryListDialog.h \
../includes/GUIInterface.h \
backbone/Bookmarks.h \
- gui/WordListItem.h
++ gui/WordListItem.h \
+ backbone/BookmarkTranslations.h
FORMS += gui/MainWindow.ui
while (!reader.atEnd() && !stopped) {
QCoreApplication::processEvents();
- //usleep(50);
- // usleep(50);
reader.readNext();
if(reader.tokenType() == QXmlStreamReader::StartElement) {