Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 5 Aug 2010 10:01:28 +0000 (12:01 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 5 Aug 2010 10:01:28 +0000 (12:01 +0200)
commita5ca3a296ca4881f2ff226300df8cafbe3f534f9
treee81037faa2ec214f9fd14933a62f68ba431c641a
parent20ec65feba7902b618c929272b680fede5a71827
parentea94c0701c904530e0aa9039be93f4756aa1d98e
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

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