Eike Ziller b0efd44d20 Merge remote-tracking branch 'origin/2.3' ...

Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b

2011-09-15 11:50:29 +02:00

..

changes-1.1.0

Pedantic changes to changelog that I forgot in a previous commit

2009-04-20 12:57:02 +02:00

changes-1.1.1

Changes file for 1.1.1

2009-05-25 15:36:11 +02:00

changes-1.2.0

Further changelog perfectionism

2009-06-16 16:21:50 +02:00

changes-1.2.1

Updated changelog

2009-07-10 15:03:20 +02:00

changes-1.3.0

Update changes file

2009-10-12 17:50:41 +02:00

changes-1.3.1

Missing entry in changelog

2010-01-14 15:13:02 +01:00

changes-2.0.0

Reflect that 2.0 has some qml features removed.

2010-06-17 17:37:39 +02:00

changes-2.0.1

merge forgotten changes-2.0.1 file

2010-10-05 12:50:00 +02:00

changes-2.1.0

update changelog

2010-10-21 18:35:28 +02:00

changes-2.2.0

Doc: edit change file

2011-04-04 11:29:39 +02:00

changes-2.3.0

Doc: edit for style and grammar

2011-07-13 18:25:05 +02:00

changes-2.3.1

QtQuickApp: Fix qmake dependency to Qt Quick Components for Symbian

2011-09-12 11:24:19 +02:00

changes-2.4.0

Add changes-2.4.0 file

2011-09-13 16:46:06 +02:00

copyright_template.txt

Add copyright header template

2011-07-06 12:35:06 +02:00

known-issues

Changed links to bugtracker to https

2011-08-10 13:44:03 +02:00