Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 10 Sep 2010 12:34:42 +0000 (14:34 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 10 Sep 2010 12:34:42 +0000 (14:34 +0200)
commitdcb40b514baa31b7605af86c03f2583567c6c2d9
tree763acbc0c0fdbe921191825648813b61cd31fdbc
parent07d8b2ff6ea2e1cfb13fbcfae0a7a5db43345178
parentcdca39af962475e42a52b584fdba5f7c2dc67c5a
Merge branch 'master' into google
src/mdictionary/backbone/History.cpp
src/mdictionary/backbone/backbone.cpp
src/plugins/xdxf/xdxfplugin.cpp