diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:27 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:27 +0200 |
| commit | ef8ed357881b212e2debe2ccf975996bca2331c2 (patch) | |
| tree | 67cb9ee9821bd1fb9b9813b038ffbc06a7847ddd /src/serialport/qserialport_symbian.cpp | |
| parent | b111a3a6fb4b6c2892fe3b1c9cdf72d8e8f9ea8d (diff) | |
| parent | f1761c1236edce428278f7a9e8aa1091097eaa57 (diff) | |
| download | qtserialport-ef8ed357881b212e2debe2ccf975996bca2331c2.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I5887622f233275703cca8cc2a5db4aaaccc72d97
Diffstat (limited to 'src/serialport/qserialport_symbian.cpp')
0 files changed, 0 insertions, 0 deletions