Merge branch 'xdxf'
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 6 Aug 2010 06:37:32 +0000 (08:37 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 6 Aug 2010 06:37:32 +0000 (08:37 +0200)
commitd4b38c5c2e76e1e48bb0e1ef45d9c6853a60be22
treed1b269007e7477abdefc3ef57f292554b4e37725
parentad11b3992fbc6cb8f25f587e6061314f288e3730
parentce2f04cbf4a27c63a60f98bda85e72e66266c0d8
Merge branch 'xdxf'

Conflicts:
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
trunk/src/plugins/xdxf/src/TranslationXdxf.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.h