Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorPiotrek <ppilar11@gmail.com>
Mon, 30 Aug 2010 13:50:23 +0000 (15:50 +0200)
committerPiotrek <ppilar11@gmail.com>
Mon, 30 Aug 2010 13:50:23 +0000 (15:50 +0200)
commit0ec97617487eaf0176c87781b3f6492ab4c360c5
tree5f2c517942523169284f8bc3c62b13f3deb7524b
parente03987cd972d6b46c72d9ac5b14a3fbb64ff1c48
parent00f9c51c866f1502fa4fb6eafd0d29bb53f79a40
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
trunk/src/plugins/google/src/GooglePlugin.h
trunk/src/plugins/google/src/GoogleSettingsDialog.h