Merge branch 'gui' into cache
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 20 Aug 2010 09:48:20 +0000 (11:48 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 20 Aug 2010 09:48:20 +0000 (11:48 +0200)
commit51f7572046261c9b326399f10c0540b8b63e8da6
tree10e02f0aab9f40951feee44e5fb57b6c1552a723
parent3ee3f4f51e1cf0053467c152c810583e5bc06dbc
parent7c20df33d29b297b4e91a8aedf17ef30fb95f163
Merge branch 'gui' into cache

Conflicts:
trunk/src/plugins/xdxf/src/TranslationXdxf.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