Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 9 Aug 2010 11:12:47 +0000 (13:12 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 9 Aug 2010 11:12:47 +0000 (13:12 +0200)
commit1b5bf15f6c1881434720b181a09027dc2cd8303f
treef79435dec36c4a95362da045ddaadd51797d1f4c
parentf3e4bf765f661f62800c7336b00fefd2d7b80e12
parenta9d8f15902d8e68c99a0ffaf816337b842b68947
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

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