diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-30 08:13:57 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-30 08:14:00 +0100 |
| commit | 8aa7bd47d35f9c6b699e4d4c8cc24911ba9443ff (patch) | |
| tree | 7b7a928ef761e54e405f68436f5f8d51939ed497 /build_scripts/main.py | |
| parent | a4f7ce5f65621de768510e11da5762c3c7b2a983 (diff) | |
| parent | 6e2741e3e38c09a014efc9cb0079ef942ff54626 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I4fb74ab92e03dd13e054227deac2bd095c47bce0
Diffstat (limited to 'build_scripts/main.py')
0 files changed, 0 insertions, 0 deletions