Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorBartosz Szatkowski <bulislaw@linux.com>
Thu, 2 Sep 2010 13:55:57 +0000 (15:55 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Thu, 2 Sep 2010 13:55:57 +0000 (15:55 +0200)
1  2 
src/mdictionary/backbone/backbone.cpp
src/plugins/xdxf/XdxfLoadDialog.h

Simple merge
Simple merge