Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorPiotrek <ppilar11@gmail.com>
Fri, 3 Sep 2010 12:39:59 +0000 (14:39 +0200)
committerPiotrek <ppilar11@gmail.com>
Fri, 3 Sep 2010 12:39:59 +0000 (14:39 +0200)
commit504579054540ea1a39a7941c15dd180fa0374bbe
tree41df4358af72d32f4b53d4cfd1a89923a7fa1ccb
parentddb5d0ac9dab42c86329c2acd9a505c6b4d43865
parent65469884bf3481f84cf8ed707fc3fa0571ede1c9
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
src/include/CommonDictInterface.h
src/mdictionary/backbone/backbone.cpp
src/mdictionary/gui/main.cpp
src/mdictionary/mdictionary.pro
src/plugins/google/GooglePlugin.h
src/plugins/google/google.pro
src/plugins/xdxf/xdxf.pro
src/plugins/xdxf/xdxfplugin.cpp
src/plugins/xdxf/xdxfplugin.h