Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into gui
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 4 Aug 2010 12:08:57 +0000 (14:08 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 4 Aug 2010 12:08:57 +0000 (14:08 +0200)
commit39a67ad05db3022d10aed98b915055f3be3d279b
treeacee4aaaf9a8894761d1c32a906c305106e0ad4e
parent461f57f1c95a7b061991f573b2e7d1724fad79f2
parent22b7c270de4fcb536e0325485e69952ea88ebff7
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into gui

Conflicts:
trunk/src/base/backbone/backbone.cpp
trunk/src/base/backbone/backbone.cpp