Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 3 Sep 2010 06:29:17 +0000 (08:29 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 3 Sep 2010 06:29:17 +0000 (08:29 +0200)
commitcbfa49bdf28ba2fabdabd99e4e28c0c4bbecdc04
tree073ec902855f7292bfab91f21cf4388d85449bfc
parentb2edd0bdef4d55ca9c19d70885e36f384bcbceb6
parenta652432c9298ae52737ee993dc6bd9f07eb7c995
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
src/mdictionary/gui/DictManagerWidget.cpp
src/plugins/xdxf/xdxfplugin.cpp