Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorPiotrek <ppilar11@gmail.com>
Tue, 7 Sep 2010 11:53:32 +0000 (13:53 +0200)
committerPiotrek <ppilar11@gmail.com>
Tue, 7 Sep 2010 11:53:32 +0000 (13:53 +0200)
commitf5c4cbef5a654f935b3bef9cd1f76ecaa8157c8a
treeabff2ea69556be4974f391dbb65e6aa5f2639b35
parent013b7d08097a91b8b78c5d081ba5aa1260bd0e5d
parentedc4669b669b0699633997879b590acc7d1fc043
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
data/xsl/style.css
data/xsl/xsl.xsl
src/mdictionary/gui/DictManagerWidget.cpp
src/plugins/xdxf/XdxfLoadDialog.cpp
src/plugins/xdxf/XdxfLoadDialog.h
src/plugins/xdxf/XdxfSettingsDialog.cpp
data/xsl/style.css
src/mdictionary/gui/DictManagerWidget.cpp
src/mdictionary/gui/MenuWidget.cpp