delta/qt-creator.git - code.qt.io: qt-creator/qt-creator.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	License update	Eike Ziller	2014-10-09	1	-7/+8
\| \| \| \| \|	Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
*	Incremented year in copyright info	Robert Loehning	2014-01-08	1	-1/+1
\| \| \| \| \| \|	Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
*	Merge remote-tracking branch 'origin/2.6'	Oswald Buddenhagen	2013-01-31	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
\| *	Incremented year in copyright infov2.6.2	Robert Loehning	2013-01-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* \|	CppEditor: simplify CppQuickFixOperation interface	hjk	2012-11-07	1	-3/+1
\|/ \| \| \| \|	Change-Id: Ib3ed82c7f07f80027b18471ffb7b3055fa74eb52 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
*	Adjust license headers	hjk	2012-10-05	1	-22/+21
\| \| \| \| \|	Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
*	Contact -> qt-project.org	Eike Ziller	2012-07-19	1	-3/+1
\| \| \| \| \|	Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
*	Long live the king!	hjk	2012-01-26	1	-1/+1
\| \| \| \| \|	Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
*	more s/info@qt.nokia.com/qt-info@nokia.com/	Eike Ziller	2011-11-11	1	-2/+2
\| \| \| \| \|	Change-Id: I5eecac63f45cf5bd192bd2ee42370d6338c1ec9f Reviewed-by: hjk <qthjk@ovi.com>
*	QmlJS: Add quick fix to wrap element in Loader.	Christian Kamm	2011-10-19	1	-0/+51
	Change-Id: Ie8b1624abfd9faa8c6153ad99e48964d597d543c Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>