From: Andrey Paskal <apaskal@gmail.com>
Date: Wed, 30 Dec 2009 08:04:32 +0000 (+0300)
Subject: Merge branch 'qtscript' of git@github.com:app/ananas-labs-qt4 into qtscript
X-Git-Url: https://gitweb.ananas.su/?a=commitdiff_plain;h=b5b412ed11e011bab5d55c5bbcb49bf1106ddcc1;p=projects%2Fananas-labs-qt4.git

Merge branch 'qtscript' of git@github.com:app/ananas-labs-qt4 into qtscript

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

b5b412ed11e011bab5d55c5bbcb49bf1106ddcc1