Skip to content
GitLab
Explore
Sign in
Marco Bubke
flatpak-qt-creator
Repository
flatpak-qt-creator
src
plugins
qmldesigner
designercore
instances
puppetcreator.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/3.3' into 3.4
· ff1fbb2b
Eike Ziller
authored
Mar 02, 2015
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I897baf92970c540f4d64b6a726ce604791234b1a
ff1fbb2b