src/plugins/cpptools/cppmodelmanager.cpp · 80b737252b8b01525805f48bf95678ea4835b294 · Marco Bubke / flatpak-qt-creator

Merge remote-tracking branch 'origin/2.6' · 70b5e1f6

Eike Ziller authored Oct 16, 2012

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d

70b5e1f6

cppmodelmanager.cpp 43.2 KB

Replace cppmodelmanager.cpp