Merge branch 'google' of ssh://drop.maemo.org/git/mdictionary into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 27 Aug 2010 08:48:01 +0000 (10:48 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 27 Aug 2010 08:48:01 +0000 (10:48 +0200)
commit1fc3783881e9b94be3bfceebc2c1ad0cc03bae93
treefd0074ac4c9c38860797beeeb30072114119fc75
parentc05eb4d35e399e8710c02eed9181fc2f2f000305
parentdd9dd83d05302dbeaedb479ebcdcaaa4668566bd
Merge branch 'google' of ssh://drop.maemo.org/git/mdictionary into google

Conflicts:
trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp