Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 15 Sep 2010 08:09:41 +0000 (10:09 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 15 Sep 2010 08:09:41 +0000 (10:09 +0200)
commitb909c0704338a9d0c4c1b80cdfbbaae6eaea5411
tree8c76a22ed0c3c20d3641c75acc7db299d0d6d654
parentdb6a41c789da96c2ac7ec750c351eca084a3185b
parent877b619c25f61575dde7085050ae38717686b1f1
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
src/desktopWidget/pl_PL.ts