From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Wed, 4 Aug 2010 10:58:05 +0000 (+0200)
Subject: Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into gui
X-Git-Tag: 0.4~116
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=e6a48d8ada3df14a07b317eb561afae140c43a94;p=mdictionary

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

Conflicts:
	trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
---

e6a48d8ada3df14a07b317eb561afae140c43a94
diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index af2a463,465c62f..3622aa2
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@@ -121,4 -120,7 +121,9 @@@ bool XdxfPlugin::isAvailable() const 
      return true;
  }
  
+ uint XdxfPlugin::hash() const
+ {
+     return 1;
+ }
++
 +Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin)