Skip to content
GitLab
Commit 41dfd0ce authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/5.12' into 5.13 

Conflicts:
	.qmake.conf
	translations/assistant_zh_TW.ts
	translations/linguist_zh_TW.ts
	translations/qtbase_zh_TW.ts

Change-Id: Ie7494d6c6be43e152171a5405195cac08fff0002
parents 828c7105 5f63c127
dev 5.13 5.14 5.14.1 5.14.2 5.15 5.15-tr 5.15.0 5.15.1 5.15.2 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 v5.15.0-alpha1 v5.14.1
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4799 additions and 190 deletions
Supports Markdown
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