Skip to content
Find file Blame History Permalink
  • Eike Ziller's avatar
    Merge remote-tracking branch 'origin/4.3' · 88897f3a
    Eike Ziller authored 
     Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
    88897f3a