Files
qt-creator/doc/images
Oswald Buddenhagen 6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
..
2010-10-08 16:27:13 +02:00
2012-03-20 13:36:07 +01:00
2012-04-11 15:39:21 +02:00
2012-04-11 15:39:21 +02:00
2012-04-11 15:39:21 +02:00
2012-04-25 17:02:15 +02:00
2010-02-23 17:46:52 +01:00
2012-07-31 15:01:49 +02:00
2010-02-23 17:46:52 +01:00
2010-02-23 17:46:52 +01:00
2012-03-26 13:12:21 +02:00
2012-07-13 15:37:34 +02:00
2012-03-14 17:39:57 +01:00
2012-03-14 17:39:57 +01:00
2012-03-14 17:39:57 +01:00
2010-02-23 17:46:52 +01:00