con 2ca77dfe1e Merge remote branch 'origin/2.1' ...

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp

2011-03-02 11:49:52 +01:00

..

addressbook-sdk

It's 2011 now.

2011-01-12 15:34:06 +01:00

batteryindicator

Merge remote branch 'origin/2.1'

2011-03-02 11:49:52 +01:00

textfinder

It's 2011 now.

2011-01-12 15:34:06 +01:00

doc_src_plugins.qdoc

It's 2011 now.

2011-01-12 15:34:06 +01:00