Skip to content
Snippets Groups Projects
Commit 07bec99e authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/4.5' 

 Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
parents b1701ae9 86ff493b
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1837 additions and 1514 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment