Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 09:48:58 +0000 (11:48 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 09:48:58 +0000 (11:48 +0200)
commitad6ab232922abea2ecb8cd7896e5288abdace84c
tree47fc83af126def574fe0a860c22d2acd0833f360
parentc5b2a4eeec6e31f30b267b72f1f4c1a98160dc78
parent55058bba8c2e45dfb872d0a716f87f4adb7a8471
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
trunk/src/base/backbone/backbone.cpp
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp