Skip to content
GitLab
Explore
Sign in
Tobias Hunger
qt-creator
Repository
qt-creator
src
plugins
projectexplorer
projecttree.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/4.2'
· dbb2288f
Eike Ziller
authored
Feb 20, 2017
Conflicts: src/shared/qbs Change-Id: I05c4945d238b7724ca73477fc3b21554564951c0
dbb2288f