Files
qt-creator/src/plugins/macros
Oswald Buddenhagen 868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
..
2010-12-20 11:16:15 +01:00
2014-01-08 08:29:47 +01:00
2014-01-08 08:29:47 +01:00
2010-12-20 11:16:15 +01:00