Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 11 Aug 2010 10:34:01 +0000 (12:34 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 11 Aug 2010 10:34:01 +0000 (12:34 +0200)
commit825e48cd57d14ff679e65e20e7a9b564682bcc88
treea28eb5c8fe406ed3254a08cdd3b721af8fe8c907
parent3842b2e0613af5f5831c4b57f89534ee24bd95ba
parent166389a8944478175c97f25a1379bad13c875f5d
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
trunk/tests/mDictionaryTests/mDictionaryTests.pro.user
trunk/tests/mDictionaryTests/tst_Backbone.cpp
trunk/src/base/backbone/backbone.cpp
trunk/src/base/backbone/backbone.h
trunk/tests/mDictionaryTests/mDictionaryTests.pro.user
trunk/tests/mDictionaryTests/tst_Backbone.cpp