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

Merge branch '2.6' 

Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
parents e6270852 5fdb9f0d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 148 additions and 98 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment