Skip to content
GitLab
Explore
Sign in
Tobias Hunger
qt-creator
Repository
qt-creator
src
plugins
cpptools
cpptools.pro
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/2.5'
· 42f4595e
Eike Ziller
authored
Jul 24, 2012
Conflicts: src/libs/cplusplus/cplusplus-lib.pri Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
42f4595e