Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 28 Sep 2010 08:50:25 +0000 (10:50 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 28 Sep 2010 08:50:25 +0000 (10:50 +0200)
commit0c39b0f456a9a9867d80f68f8c234ec03f3ab5ba
treee5430c3c014c3fb829721af64f1a73a5d9c977cd
parent1277aea783f9b818fb81799f6c84ab496747af15
parent106a69ed4e065bd672bef885f558bf86d629e0e2
Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http

Conflicts:
src/plugins/xdxf/xdxf.pro
src/plugins/xdxf/xdxf.pro
src/plugins/xdxf/xdxfplugin.cpp