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-11-26 14:29:21 +00:00
2019-05-24 06:45:08 +00:00
2016-01-19 16:05:29 +00:00
2019-04-29 13:40:28 +00:00
2018-01-09 14:23:43 +00:00
2019-05-28 07:19:45 +00:00
2019-05-10 09:48:41 +00:00
2019-05-28 14:01:01 +02:00
2015-07-03 09:50:46 +00:00
2010-08-25 11:57:02 +02:00
2018-09-10 11:09:31 +00:00
2019-01-29 09:14:47 +00:00
2018-10-11 12:48:38 +00:00
2019-05-27 11:35:37 +00:00
2019-04-04 06:56:32 +00:00
2019-05-27 12:12:23 +00:00
2017-02-28 09:37:43 +00:00
2019-05-17 13:33:28 +00:00
2019-04-29 12:52:05 +00:00