con d24d01f49c Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0) ...

Conflicts:
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h

2010-07-13 11:31:05 +02:00

..

addressbook-sdk

Doc: Updated example license to three clause BSD license.

2010-05-25 18:47:15 +02:00

batteryindicator

Doc - Add info about layouts to the example

2010-07-07 10:38:47 +02:00

textfinder

Doc: Updated example license to three clause BSD license.

2010-05-25 18:47:15 +02:00

doc_src_plugins.qdoc

Documentation: Fix whitespace of merge request 138.

2010-07-12 10:02:01 +02:00