Skip to content
GitLab
Explore
Sign in
Marco Bubke
flatpak-qt-creator
Repository
flatpak-qt-creator
src
plugins
coreplugin
generalsettings.ui
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/2.7'
· f60873a2
Eike Ziller
authored
Mar 08, 2013
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
f60873a2