diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:12:10 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:12:10 +0100 |
| commit | 3de7382044cd60ca3bc2d2bfa94d4c4df5466c62 (patch) | |
| tree | 12726a32bf0db9837d7169b7630a0b9dfc0429d7 /.tag | |
| parent | fa9bde7d3a12ede956339c570f7b32f95d231e57 (diff) | |
| parent | 7b33faa1e97353d658fc7cd13ca789fccfa7ec1f (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Conflicts:
dist/changes-5.4.0
7231e1fbe24102f2a93b34dfa70e3dca884440d2 went into 5.4 instead of the
5.4.0 branch, thus the conflict.
Change-Id: I70b8597ab52506490dcaf700427183950d42cbd1
Diffstat (limited to '.tag')
0 files changed, 0 insertions, 0 deletions