Skip to content
Snippets Groups Projects
Commit 995dfff2 authored by con's avatar con
Browse files

Merge remote branch 'origin/2.1.0' into 2.1 

Conflicts:
	share/qtcreator/translations/qtcreator_pl.ts
parents 37fd6189 a8fba49a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 271 additions and 92 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