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
..
2013-02-04 14:08:37 +01:00
2011-08-03 16:12:35 +02:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2011-10-10 18:22:49 +02:00
2013-01-29 16:27:03 +01:00
2011-08-03 16:12:35 +02:00
2013-05-14 19:16:22 +02:00
2013-04-22 16:58:09 +02:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00
2013-01-29 16:27:03 +01:00