diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:32:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 13:14:05 +0200 |
| commit | 8fa108de666e815053c6e586f1efabc592ae20a5 (patch) | |
| tree | 6e9418f38cd884a7a204d7c0e1ec10c871c37346 /.gitignore | |
| parent | b2dcacddabb5bcfbc031a0681a0e90996092a506 (diff) | |
| parent | 10967b1443720116744ecfc42fe442681d149c5a (diff) | |
| download | qtserialport-8fa108de666e815053c6e586f1efabc592ae20a5.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
src/serialport/qserialport.cpp
Change-Id: I858fec6e426f5fd867b7eda7b1db69a2d447b357
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions