Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 13:42:48 +0000 (15:42 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 13:42:48 +0000 (15:42 +0200)
commit129825e0f9487e61c83eae9ad48221af29691f86
tree15964677bd3e2c0c1f9ad7dc98cc30f9b5eb6a60
parent48ce7c4aeb156fb9aea788ce0a16ee7c5f102d26
parent00f9c51c866f1502fa4fb6eafd0d29bb53f79a40
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
trunk/src/plugins/google/src/GoogleSettingsDialog.cpp