Merge branch 'qtscript' of git@github.com:app/ananas-labs-qt4 into qtscript
authorAndrey Paskal <apaskal@gmail.com>
Wed, 30 Dec 2009 08:04:32 +0000 (11:04 +0300)
committerAndrey Paskal <apaskal@gmail.com>
Wed, 30 Dec 2009 08:04:32 +0000 (11:04 +0300)
commitb5b412ed11e011bab5d55c5bbcb49bf1106ddcc1
tree98567d7f18b58e1101d118774ebaa36632f9ce6b
parent29c44975b0e949d3021334e33a98f55e331d3805
parent114a5a3d991628893ad2daccbd9c3cd630174fd5
Merge branch 'qtscript' of git@github.com:app/ananas-labs-qt4 into qtscript

Conflicts:
src/designer/designer.pro
src/editor/editor.pro
src/designer/designer.pro