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

Merge remote-tracking branch 'origin/2.7' 

Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
parents e84647ae fac11973
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 328 additions and 128 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