Skip to content
Snippets Groups Projects
Commit 1f3896e8 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/2.3' 

Conflicts:
	share/qtcreator/dumper/bridge.py
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/remotelinux/remotelinuxapplicationrunner.cpp

Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
parents fdb0876e 600127e8
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 25 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