Merge branch 'xdxf'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Thu, 5 Aug 2010 10:15:39 +0000 (12:15 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Thu, 5 Aug 2010 10:15:39 +0000 (12:15 +0200)
commitf72cd19cb3119da143eaa23e0b9cb7ec46fd8a40
tree25be56dc479d633d5cea947bec73738c43051094
parenta5ca3a296ca4881f2ff226300df8cafbe3f534f9
parent8ab57f86b1fa1594cae5fcb8d2d7f161045b9a2d
Merge branch 'xdxf'

Conflicts:
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h