Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorjakub <jakub.jaszczynski@comarch.com>
Thu, 18 Nov 2010 15:32:36 +0000 (16:32 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Thu, 18 Nov 2010 15:32:36 +0000 (16:32 +0100)
commit00c4970f59cd301a63e58a470619b9ad5ab075f2
tree8d2fb52c4bb89626ed80a090a54c95f013f77c25
parent34f8c22d8c25a1c46cb4278814443443ac82909c
parent0541ad5fe91abe01ee126839b589efd318b8cb08
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
src/plugins/stardict/CompressedReader.h
src/plugins/xdxf/XdxfDictDownloader.cpp