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

Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
parents 5606b9d2 629de47f
No related branches found
No related tags found
No related merge requests found
Showing
with 17347 additions and 2618 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment