Skip to content
GitLab
Explore
Sign in
Marco Bubke
flatpak-qt-creator
Repository
flatpak-qt-creator
src
plugins
qmakeprojectmanager
qmakeproject.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/4.0'
· 1ae483fc
Eike Ziller
authored
Apr 05, 2016
Conflicts: src/libs/utils/tcpportsgatherer.h Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
1ae483fc