Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 31 Aug 2010 12:25:58 +0000 (14:25 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 31 Aug 2010 12:25:58 +0000 (14:25 +0200)
commit11e55d0146706b0a759a852d47cbc792b6474c48
tree48992f195da52ce4fecdfaa033b8f5b74d928023
parent34653a0eb7b0d18d7be994f79cad9c1ec1fbb33b
parent31cca847dbb2ec2e470f87d57566a60a73180149
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
trunk/src/plugins/google/src/GoogleSettingsDialog.h