From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Mon, 16 Aug 2010 13:34:15 +0000 (+0200)
Subject: Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
X-Git-Tag: 0.4~44^2~20^2~1
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=9be596073220ddbc96fa3d1cf273cf7f4fa7e2e7;p=mdictionary

Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

Conflicts:
	trunk/src/base/base.pro
	trunk/src/plugins/xdxf/src/xdxfplugin.cpp
---

9be596073220ddbc96fa3d1cf273cf7f4fa7e2e7
diff --cc trunk/src/base/base.pro
index ab9b7a0,2a02ca7..f48ede5
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -53,7 -52,7 +53,8 @@@ HEADERS  += gui/MainWindow.h 
      gui/HistoryListDialog.h \
      ../includes/GUIInterface.h \
      backbone/Bookmarks.h \
-     gui/WordListItem.h
++    gui/WordListItem.h \
+     backbone/BookmarkTranslations.h
  
  FORMS    += gui/MainWindow.ui
  
diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 4d7828d,8497d1d..cab4493
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -436,7 -433,7 +432,6 @@@ bool XdxfPlugin::makeCache(QString dir
      while (!reader.atEnd() && !stopped) {
  
          QCoreApplication::processEvents();
-         //usleep(50);
 -       // usleep(50);
          reader.readNext();
  
          if(reader.tokenType() == QXmlStreamReader::StartElement) {