Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 1 Oct 2010 08:44:52 +0000 (10:44 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 1 Oct 2010 08:44:52 +0000 (10:44 +0200)
commitb9fa3441d344042d1c23f3df4b90c8bbd6b29ae4
treebd13d6f801a81d0303dd63d90655475407ed228a
parent7cc6f08b87edcecf8e404094baded4917b10bb9d
parentfbad9ee678c564e56fa06bc5822d8d84d537cc82
Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http

Conflicts:
src/plugins/xdxf/DownloadDict.h
src/plugins/xdxf/XdxfDictDownloader.cpp
src/plugins/xdxf/DownloadDict.h
src/plugins/xdxf/XdxfDictDownloader.cpp
src/plugins/xdxf/XdxfDictDownloader.h