Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 18 Aug 2010 10:24:21 +0000 (12:24 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 18 Aug 2010 10:24:21 +0000 (12:24 +0200)
commita5e27526e78a68c2bb7f2bc8db3a80c771886645
treeb49763b8e3642fd1dfc52a5fe37a3edbd96300f7
parent02bfcfa991dc8caaeec23e598d34b5b368e813a1
parent569effaa3ef7df71616e2fae9b1e89c5292f4c48
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

Conflicts:
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/MainWindow.h
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/MainWindow.h