diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:02:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:02:51 +0200 |
| commit | 71c38793265fc2966cde5ef64ef21c4bb122bd0f (patch) | |
| tree | 71e902a4092f0f91183ed5a4f8338054c19676c5 | |
| parent | 9177a6c473afde7207c53f4d72f015a16dbeeb5f (diff) | |
| parent | e257bdc9aae5583b187bafb5e69e4a6143e3bf4e (diff) | |
| download | qtserialport-71c38793265fc2966cde5ef64ef21c4bb122bd0f.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: Idfa590f63af206db0cc09327a100cf480cabe903
0 files changed, 0 insertions, 0 deletions