Merge branch 'gui'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 16 Aug 2010 11:54:35 +0000 (13:54 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 16 Aug 2010 11:54:35 +0000 (13:54 +0200)
commit04a206780e8c28968a94c694927cfeeb0d6b9cba
treeb6d944c4f93bd2e013cba3e1ee0564360854c5bf
parent0cc472e65e3c086a85bb8dd5f41049e162e4946a
parent66c9560a7d1a665751b4863a75984c3650c7a671
Merge branch 'gui'

Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/src.pro
trunk/src/plugins/xdxf/src/xdxfplugin.cpp