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

Merge commit 'origin/1.3' 

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
parents e77e8e9a 2c115e93
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 21223 additions and 1049 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