Eike Ziller 6fd252b0a5 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580

2012-10-05 21:20:50 +02:00

..

gdb

Merge remote-tracking branch 'origin/2.6'

2012-10-04 12:23:39 +02:00

installer

Adjust license headers

2012-10-05 17:12:56 +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

Doc: edit for grammar and style

2011-11-02 12:53:14 +01:00

changes-2.4.1

Update changes file.

2012-01-24 10:18:28 +01:00

changes-2.5.0

Update changes file

2012-04-23 13:17:53 +02:00

changes-2.5.1

Add changes file for 2.5.1

2012-07-24 12:36:01 +02:00

changes-2.5.2

Add changes file for 2.5.2

2012-08-08 15:47:06 +02:00

changes-2.6.0

Added more resource editor improvements and fixed wording.

2012-09-18 16:57:21 +02:00

copyright_template.txt

Adjust license headers

2012-10-05 17:12:56 +02:00

known-issues

bugreports.qt.nokia.com -> bugreports.qt-project.org

2012-01-26 19:58:08 +01:00