Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http
authorPrzemyslaw Wojtysiak <pwojtysiak88@gmail.com>
Tue, 5 Oct 2010 06:56:05 +0000 (08:56 +0200)
committerPrzemyslaw Wojtysiak <pwojtysiak88@gmail.com>
Tue, 5 Oct 2010 06:56:05 +0000 (08:56 +0200)
1  2 
src/plugins/xdxf/XdxfDialog.cpp

Simple merge