Skip to content
GitLab
Explore
Sign in
Tobias Hunger
qt-creator
Repository
qt-creator
src
plugins
cppeditor
cppeditor.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/3.2'
· c4e51e74
Eike Ziller
authored
Aug 19, 2014
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I926bdfc7df6158207cfc07f3c6c591d0a59b7667
c4e51e74