Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 18 Aug 2010 11:36:27 +0000 (13:36 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 18 Aug 2010 11:36:27 +0000 (13:36 +0200)
commitfa1519d1f91e2b16a2a472ca82325fd6cbf69077
treef2097871ed53c78f2695a212342a77716aa9b07a
parentb2e6ab63f1b6075fb02597f2601962019fb85469
parentc0b22bce4ce5dbdee913e597a5a27c59c69a57c6
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

Conflicts:
trunk/src/base/gui/AboutWidget.cpp
trunk/src/base/gui/AboutWidget.cpp