Oswald Buddenhagen 04d4d309f7 Merge remote branch 'origin/2.1' ...

Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp

2010-11-15 19:03:18 +01:00

..

mobileapp

Merge remote branch 'origin/2.1'

2010-11-02 11:14:03 +01:00

qmlapp

Merge remote branch 'origin/2.1'

2010-11-15 19:03:18 +01:00

qt4project

Fix indention of code generated for mobile gui apps

2010-04-15 17:24:51 +02:00

shared

Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885

2010-11-01 17:03:46 +01:00

wizards

Merge remote branch 'origin/2.1'

2010-11-10 17:02:40 +01:00