From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Mon, 9 Aug 2010 13:40:41 +0000 (+0200)
Subject: Merge branch 'gui'
X-Git-Tag: 0.4~70^2~4
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=17d6ea32b40cc9fd00c0f7bddabd7dafa30255f5;p=mdictionary

Merge branch 'gui'

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

17d6ea32b40cc9fd00c0f7bddabd7dafa30255f5