Files
qt-creator/src/plugins/android
Eike Ziller 016767b2a6 Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/projectexplorer/projectmodels.cpp

Change-Id: I290cba328212cadd3c12909d1f2f3642d326a1ca
2017-03-28 09:56:16 +02:00
..
2016-06-22 07:31:41 +00:00
2016-07-04 09:35:58 +00:00
2017-03-13 22:05:30 +00:00