Merge remote branch 'origin/2.1'

author con <qtc-committer@nokia.com>

Tue, 2 Nov 2010 10:14:03 +0000 (11:14 +0100)

committer con <qtc-committer@nokia.com>

Tue, 2 Nov 2010 10:14:03 +0000 (11:14 +0100)
author con <qtc-committer@nokia.com>
Tue, 2 Nov 2010 10:14:03 +0000 (11:14 +0100)
committer con <qtc-committer@nokia.com>
Tue, 2 Nov 2010 10:14:03 +0000 (11:14 +0100)
diff --cc share/qtcreator/gdbmacros/dumper.py
Simple merge
diff --cc share/qtcreator/gdbmacros/gdbmacros.py
Simple merge
diff --cc share/qtcreator/templates/qmlapp/app.pro
Simple merge
author	con <qtc-committer@nokia.com>
	Tue, 2 Nov 2010 10:14:03 +0000 (11:14 +0100)
committer	con <qtc-committer@nokia.com>
	Tue, 2 Nov 2010 10:14:03 +0000 (11:14 +0100)
		1	2
share/qtcreator/gdbmacros/dumper.py	patch \|	diff1 \|	diff2 \|	blob \| history
share/qtcreator/gdbmacros/gdbmacros.py	patch \|	diff1 \|	diff2 \|	blob \| history
share/qtcreator/templates/qmlapp/app.pro	patch \|	diff1 \|	diff2 \|	blob \| history