diff options
| author | Michael Brüning <michael.bruning@theqtcompany.com> | 2016-02-16 16:00:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-02-16 17:40:12 +0000 |
| commit | ec7dece4a475c0307b199bae1a3e1d45425d6150 (patch) | |
| tree | f426adbd88486bc0bee0152bfd1c7465def4c4c0 /src | |
| parent | 8b4a66143be7a0ad3abd685aae2200d0c6071c71 (diff) | |
| parent | 1246720283e41f20323d93cdcc96fdfa2fb5eacd (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions