Merge branch 'searching' of ssh://drop.maemo.org/git/mdictionary into searching
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 06:36:59 +0000 (08:36 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 06:36:59 +0000 (08:36 +0200)
commit9d6a05e4bd5f166f2a834bfe276feced58c22d13
treee8d1b47123859036ca5b6f2d3b6dba25817dd7d5
parent7afbcf69da72d9e217cfcf8912ec629647363521
parent640585b824abfcd436edb4d2342da08b3103b1e6
Merge branch 'searching' of ssh://drop.maemo.org/git/mdictionary into searching

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