git://gitweb.ananas.su / projects/ananas-labs-qt4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29c4497 114a5a3)
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)
Conflicts:
src/designer/designer.pro
src/editor/editor.pro

1  2 
src/designer/designer.pro patch | diff1 | diff2 | blob | history

diff --cc src/designer/designer.pro
Simple merge
Copy of ananas-qt4 CVS module http://www.leaderit.ru/cgi-bin/cvsweb.cgi/ananas-qt4/