Merge branch 'master' into cache
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 19 Aug 2010 07:06:10 +0000 (09:06 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 19 Aug 2010 07:06:10 +0000 (09:06 +0200)
commit5f2fb6f8cd77967e394fa75ef10b61e79debaf5f
tree2767ff7165e03455cea6f7800923de65c49509aa
parente697da7bee45ffb1c0e5def0d5b4560c3081a6bb
parent9417a32c1cbb78b71c95a13e3fcee49f4ac328d1
Merge branch 'master' into cache

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