Skip to content
Find file Blame History Permalink
  • con's avatar
    Merge commit 'origin/1.1' · 412a4b02
    con authored 
    Conflicts:
	src/plugins/debugger/debuggeractions.cpp
	src/plugins/debugger/gdboptionpage.ui
    412a4b02