Merge branch 'gui' of ssh://drop.maemo.org/git/mdictionary into gui
authorBartosz Szatkowski <bulislaw@linux.com>
Thu, 19 Aug 2010 10:46:16 +0000 (12:46 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Thu, 19 Aug 2010 10:46:16 +0000 (12:46 +0200)
commitafb0aa1f1235c13c5aa687bd71ca188174c3fb37
tree624bf3fab23935f2329e06f63061e81a6df9163c
parent83d8818e771968bd1322a0b1e8d96735de4ae798
parent3c7a5a771cf8444c011e280c570f94aa13be74da
Merge branch 'gui' of ssh://drop.maemo.org/git/mdictionary into gui

Conflicts:
trunk/src/base/base.pro
trunk/src/base/base.pro