Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 30 Aug 2010 13:36:44 +0000 (15:36 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 30 Aug 2010 13:36:44 +0000 (15:36 +0200)
commit00f9c51c866f1502fa4fb6eafd0d29bb53f79a40
tree65c07a4c3a088a08ddd553a2d133171a268dcda9
parent26f59d38658d0e40551140a1c4696e8a0dbecc3f
parent239ee8cd6bb7b97d72857ad20e3ccb1de19825ad
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