lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-25 22:27:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,430 Commits 120 Branches 274 Tags
e8a60ed41bb838f40558ac39e496b4a1e32e9140
Commit Graph

2 Commits

Author SHA1 Message Date
Frederik Gladhorn
61cd31a5e3 Provisioning: Fix location of sw_versions.txt 
I did not see this in the previous direct push.

Change-Id: I620dcc7f1c562e5bd9e09d479a4a5b8598a970fb
 2018-01-31 08:32:41 +01:00
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
 2018-01-12 21:13:56 +01:00