Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

author mae <qtc-committer@nokia.com>

Mon, 26 Jan 2009 15:36:22 +0000 (16:36 +0100)

committer mae <qtc-committer@nokia.com>

Mon, 26 Jan 2009 15:36:22 +0000 (16:36 +0100)
author mae <qtc-committer@nokia.com>
Mon, 26 Jan 2009 15:36:22 +0000 (16:36 +0100)
committer mae <qtc-committer@nokia.com>
Mon, 26 Jan 2009 15:36:22 +0000 (16:36 +0100)
diff --cc src/plugins/coreplugin/coreplugin.pro
Simple merge
diff --cc src/plugins/coreplugin/mainwindow.cpp
Simple merge
diff --cc src/plugins/coreplugin/outputpane.cpp
Simple merge
author	mae <qtc-committer@nokia.com>
	Mon, 26 Jan 2009 15:36:22 +0000 (16:36 +0100)
committer	mae <qtc-committer@nokia.com>
	Mon, 26 Jan 2009 15:36:22 +0000 (16:36 +0100)
		1	2
src/plugins/coreplugin/coreplugin.pro	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/outputpane.cpp	patch \|	diff1 \|	diff2 \|	blob \| history