Merge branch 'xdxf' into gui
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Thu, 5 Aug 2010 12:43:46 +0000 (14:43 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Thu, 5 Aug 2010 12:43:46 +0000 (14:43 +0200)
commitcf978866387ff8ce5f6fad6a9c91773a6babf90a
tree29d534bc4e755c8f872a487532981c2cc0007770
parent5eb441efa5018df980bb52f25aaf4bd46ea1f85f
parent9b8fd9143d3fcfe5b842c3e21752b7732edd10c3
Merge branch 'xdxf' into gui

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