diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-11 09:23:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-11 09:28:05 +0100 |
| commit | 96ea4b2629939b5ff357402245ac2e220979ee51 (patch) | |
| tree | 7ea11c5468217915db6c3a17ec8da1407401d4fa /examples | |
| parent | a93fc13093ce6c75f23f8edcf323a1244891f14b (diff) | |
| parent | 84ec01711a9869da26f04e14fda5a5fc54073e98 (diff) | |
| download | qtserialport-96ea4b2629939b5ff357402245ac2e220979ee51.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/serialport/qserialport_win.cpp
Change-Id: Ib00a645c6660a3c81dbc9e159110f7bfc392ea36
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/serialport/doc/creaderasync.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/serialport/doc/creaderasync.qdoc b/examples/serialport/doc/creaderasync.qdoc index 2349856..a8b2101 100644 --- a/examples/serialport/doc/creaderasync.qdoc +++ b/examples/serialport/doc/creaderasync.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example creader + \example creaderasync \title Command Line Reader Async Example \ingroup qtserialport-examples |