diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-02 09:24:45 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-02 09:27:29 +0300 |
| commit | fe3daff4959a1ff723747d92218456b0cec48d2c (patch) | |
| tree | 5bae2f86d019f23e1575838b8e54f41859810665 | |
| parent | a4ffb27a0478cb563e533b61dd7215d77a9c9387 (diff) | |
| parent | 2ecb7a3b2bc2b6fc2cccd819acdb8deae8b1fde0 (diff) | |
Merge remote-tracking branch 'qt/thud' into warrior
* No actual changes, just clean-up closure merge from
now finished thud branch *
* qt/thud:
2ecb7a3b (tag: v5.13.2_QtAS) Update automotive sha1s for QtAS 5.13.2
50738182 qtsaferenderer: update to 1.1.2 RC5
6161ee20 Update automotive sha1s for QtAS 5.13.2
90aff12b Python3-watchdog version bump and package change due to pypi package deprecation
2bcce883 qtsaferenderer: make sure qtsaferenderer find its tools
4e833d00 qface: update revision
090f4921 Update automotive sha1s for QtAS 5.13.2
7803f1b9 [automotive] update fonts license
b9d0b296 qtsaferenderer: update license checksum
Conflicts:
meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
meta-boot2qt/recipes-qt/qt5/qface_git.bb
Change-Id: I977e7bc9cee222b9e3bf91fd5a7d19947e10ebae
0 files changed, 0 insertions, 0 deletions