diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 11:18:27 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 11:18:27 +0100 |
| commit | 4007fc7a26642285d82acdd1ce3caecd9ec49cc2 (patch) | |
| tree | 5f41a62afc54069eeb42641eec904efc5460f51d /qtserialbus | |
| parent | 1fcdb6cafcf7621fdea84e28a95934a4a04ea1b7 (diff) | |
| parent | 37c75a23e8d17893ec9c1bf2a4615ea3876f4204 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
.gitmodules
Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
Diffstat (limited to 'qtserialbus')
0 files changed, 0 insertions, 0 deletions