Merge branch 'gui'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 9 Aug 2010 13:40:41 +0000 (15:40 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 9 Aug 2010 13:40:41 +0000 (15:40 +0200)
commit17d6ea32b40cc9fd00c0f7bddabd7dafa30255f5
treef03fdfac271a81d8396df501b81a3ec6fb72d5eb
parent1b5bf15f6c1881434720b181a09027dc2cd8303f
parentebca01f01524617b2f4f52ed5a7f939d31019c9b
Merge branch 'gui'

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