Skip to content
Snippets Groups Projects
Commit 68f193a1 authored by con's avatar con
Browse files

Merge commit 'origin/1.3' 

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
Needed changes:
        src/plugins/qt4projectmanager/qtversionmanager.cpp
parents 78d89b54 33fedfea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1064 additions and 633 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