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

Merge remote-tracking branch 'origin/2.5' 

Conflicts:
	src/libs/cplusplus/cplusplus-lib.pri

Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
parents 3f6eed50 cebf6b93
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1597 additions and 887 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