src/plugins/cpptools/abstracteditorsupport.h · 69a00cbabecd6692a07d688db3fd52d540a0aa84 · Marco Bubke / flatpak-qt-creator

11 years ago

Eike Ziller authored 11 years ago

Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e

a2171c2d

Eike Ziller authored 11 years ago

Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e