Resolve conflict after pull
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 13 Aug 2010 09:25:50 +0000 (11:25 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 13 Aug 2010 09:25:50 +0000 (11:25 +0200)
commit2978b9517b86dc6c9f603fc22596ce6a5cf51661
tree017758081d400e887310b8a916d3509bacd17a4b
parent2fc25df0e45de188c553ff856b3a63bc6a433a60
Resolve conflict after pull
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp