Merge branch 'google'
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 3 Sep 2010 12:58:04 +0000 (14:58 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 3 Sep 2010 12:58:04 +0000 (14:58 +0200)
commita5c3ef7afaa6a96c19dae79d54e65edcd120cd83
treefffb0475c9b61d538a7c0514ea075da6139216fb
parent7e1f76f61a37d2296f82938870c225563d049bec
parent685ad3feb8856ed32d9fe6abcd46e98fccc95aab
Merge branch 'google'
src/mdictionary/backbone/backbone.cpp
src/plugins/google/GooglePlugin.cpp
src/plugins/google/google.pro
src/plugins/xdxf/xdxf.pro
src/plugins/xdxf/xdxfplugin.cpp