Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorBartosz Szatkowski <bulislaw@linux.com>
Fri, 20 Aug 2010 10:03:53 +0000 (12:03 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Fri, 20 Aug 2010 10:03:53 +0000 (12:03 +0200)
commit5c5f95746d97bc8b4376356d354ed21935cb6bfe
tree6919108bae21cecbcc399af28dcbead8a8466d93
parent502b10585d8a4ced683ab0d36311af249281dfb1
parentc7b31734e295f28237a8ed7a99670282da91557c
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

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