Eike Ziller
428fcb476b
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
2018-04-13 10:54:42 +02:00
..
2016-07-28 14:45:12 +00:00
2018-03-19 11:50:38 +00:00
2018-04-04 12:08:40 +00:00
2016-06-15 12:35:55 +00:00
2017-03-06 07:46:13 +00:00
2018-02-12 15:34:18 +00:00
2018-04-04 12:08:40 +00:00
2018-03-22 10:01:36 +00:00
2018-01-12 10:08:22 +00:00
2016-06-23 11:45:37 +00:00