Eike Ziller
646c7860cb
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericprojectplugin.cpp
src/plugins/projectexplorer/environmentaspect.cpp
src/plugins/projectexplorer/environmentaspect.h
src/plugins/projectexplorer/environmentaspectwidget.cpp
Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
2019-11-11 12:58:11 +01:00
..
2019-09-30 20:23:52 +00:00
2019-10-24 08:48:10 +00:00
2019-11-11 12:58:11 +01:00
2019-08-29 13:37:04 +00:00
2019-08-29 13:37:04 +00:00
2019-10-24 08:47:57 +00:00
2019-10-24 08:47:57 +00:00
2019-11-11 12:58:11 +01:00
2019-10-24 08:47:57 +00:00
2019-09-30 20:23:52 +00:00
2019-08-29 13:37:04 +00:00
2019-08-29 13:37:04 +00:00
2019-09-30 20:23:52 +00:00
2019-08-29 13:37:04 +00:00
2019-08-29 13:37:04 +00:00
2019-08-29 13:37:04 +00:00
2019-10-24 08:47:39 +00:00
2019-10-24 08:47:39 +00:00
2019-08-29 13:37:04 +00:00
2019-08-29 13:37:04 +00:00