Skip to content
GitLab
Explore
Sign in
Tobias Hunger
qt-creator
Repository
qt-creator
src
plugins
qtsupport
qtoptionspage.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/2.6'
· 3e7d94c3
Eike Ziller
authored
Nov 16, 2012
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
3e7d94c3