Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into xdxf
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)
commit20ec65feba7902b618c929272b680fede5a71827
tree8a29b1cd14166ef31e477e86a3f20412ce1bddc8
parent75d34db94e68c80687b97eaad8ddab350cdb657f
parent9544098a188ff039725e623edf19507f6cbafe42
Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into xdxf
trunk/src/includes/CommonDictInterface.h
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp