Skip to content
GitLab
Explore
Sign in
Tobias Hunger
qt-creator
Repository
qt-creator
src
plugins
android
androidsettingswidget.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/2.8' into HEAD
· a98fe15f
Eike Ziller
authored
Jul 08, 2013
Conflicts: qbs/pluginspec/pluginspec.qbs Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
a98fe15f