diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:09:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:09:58 +0200 |
| commit | c6027a9c0e6182bde7106bc97b927c544e76e155 (patch) | |
| tree | cb0ee001e8204df9643e04ed4b8961b8eb6c68f5 /examples/serialport/cenumerator/main.cpp | |
| parent | 789c0ebcd4ed976eb124e2da1958a48b478751c0 (diff) | |
| parent | 3c3b23b32c6d4a9067363f758aaf4ff9819b7fd8 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
examples/serialport/examples.qdoc
Change-Id: If79f2f140e72f0a499f8e61e3897848f454a5042
Diffstat (limited to 'examples/serialport/cenumerator/main.cpp')
0 files changed, 0 insertions, 0 deletions