Skip to content
Snippets Groups Projects
Commit 24d592d8 authored by con's avatar con
Browse files

Merge remote branch 'origin/1.3' 

Conflicts:
	src/plugins/bineditor/bineditorplugin.cpp
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
parents 00142e4c cd8bc8a2
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 85 additions and 61 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment