Merge branch 'gui'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 07:05:42 +0000 (09:05 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 07:05:42 +0000 (09:05 +0200)
commit7d972d4260bac9790ad0616a3c8f63ab716eddb2
tree2295ef88ba251c6b8c78dcc5cb0d436b727abae5
parent98e5260e62fe97ab215f6d428befd38a46e51d0b
parentb2719af6bbe417455054f8332c4f96ff067ebea2
Merge branch 'gui'

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