Merge branch 'gui' into bookmarks
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 16 Aug 2010 13:24:47 +0000 (15:24 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 16 Aug 2010 13:24:47 +0000 (15:24 +0200)
commitd260fb65fc09bbd876de5499c1d60111f54428ad
treeb5766749d322e9a8573ff1e7da061b12b06b96f3
parent4f443980eabe864fdff820bd771766250b225014
parent86cf2dcffef39e08689e64bf52c41a03e7968241
Merge branch 'gui' into bookmarks

Conflicts:
trunk/src/base/base.pro
trunk/src/base/base.pro