diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 23:05:16 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-20 06:41:44 +0000 |
| commit | e724de41a550dd67651942b6e28207e6e8f86f72 (patch) | |
| tree | 6953c87e8fd4339bbb408ed949434d3d5de51c5c /dependencies.yaml | |
| parent | c41c1c113e6d93198d15b72406a8c6954a11051a (diff) | |
| parent | ad17f20e332db9d45b64a13d1f80ab92934d22fa (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
dependencies.yaml
Change-Id: Iea485713daa99f508f3114f5537ee4529fded9fa
Diffstat (limited to 'dependencies.yaml')
| -rw-r--r-- | dependencies.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index fee29a45..f522f48e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../tqtc-qtbase: - ref: 694575a59b5370afc494fbf700eee8db1d1ec091 + ref: 67934c103800bae50c2ec1977758d40fa8e4e507 required: true |