Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 16 Aug 2010 13:34:15 +0000 (15:34 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 16 Aug 2010 13:34:15 +0000 (15:34 +0200)
commit9be596073220ddbc96fa3d1cf273cf7f4fa7e2e7
tree670ef072b793016ef9cd60d7e701ad1185162abb
parentd260fb65fc09bbd876de5499c1d60111f54428ad
parentc4e1de1ec4dd51af18635410ceca4ff8f9f7a1f8
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

Conflicts:
trunk/src/base/base.pro
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp