qtcreator.qbs · 96c2b2702c2ca204415e5e645d9489deafcfb17f · Marco Bubke / flatpak-qt-creator

11 years ago

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0

44931c09

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0