Skip to content
GitLab
Explore
Sign in
KDevelop
KDevelop
Repository
kdevelop
plugins
externalscript
externalscriptplugin.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/1.7'
· 349c974c
Kevin Funk
authored
Sep 12, 2014
Conflicts: shell/languagecontroller.cpp
349c974c