Eike Ziller
4704f49fbb
Merge remote-tracking branch 'origin/4.9'
Conflicts:
src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
src/shared/qbs
Change-Id: I369368de9b9c682b03e224d489589043e1f6782b
2019-05-28 14:01:01 +02:00
..
2018-01-10 11:00:26 +00:00
2019-01-07 12:45:42 +00:00
2016-03-30 15:20:19 +00:00
2016-01-19 16:01:06 +00:00
2019-05-27 12:33:29 +00:00
2014-05-07 16:19:47 +02:00
2016-03-30 15:20:19 +00:00
2018-03-02 09:07:33 +00:00
2016-01-19 16:01:06 +00:00
2009-08-31 12:30:54 +02:00
2018-02-23 08:57:49 +00:00
2016-07-15 14:16:03 +00:00
2017-10-05 12:47:05 +00:00
2019-05-20 12:03:35 +00:00
2014-09-15 12:10:01 +02:00
2014-09-15 12:10:01 +02:00
2016-06-22 17:51:20 +00:00
2018-12-19 11:05:51 +00:00
2017-11-27 14:07:40 +00:00
2017-11-27 14:07:40 +00:00