diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-28 14:16:07 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-28 14:16:07 -0700 |
| commit | 05bdf36c65dc6af32185053eb26cca793747d214 (patch) | |
| tree | 94a2fa1943b8b21d6b5c1e3f94d8a20b5e5f04fa | |
| parent | 0a1a726f849aa029960e719419fc878b6a104d46 (diff) | |
| parent | b9b845bc606022f96aeac9ef18839dd0592753c6 (diff) | |
Merge remote-tracking branch 'chrstphrchvz/maint' into maint
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/stream_to_vector.h | 2 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_number_sink.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_vector.h b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h index 10e0b2bf91..ca96bdd7fe 100644 --- a/gr-blocks/include/gnuradio/blocks/stream_to_vector.h +++ b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h @@ -43,7 +43,7 @@ namespace gr { * Make a stream-to-vector block. * * \param itemsize the item size of the stream - * \param nitems_per_block number of items to but into each vector (vector size) + * \param nitems_per_block number of items to put into each vector (vector size) */ static sptr make(size_t itemsize, size_t nitems_per_block); }; diff --git a/gr-qtgui/grc/qtgui_number_sink.xml b/gr-qtgui/grc/qtgui_number_sink.xml index eef862abd4..d10b7325c0 100644 --- a/gr-qtgui/grc/qtgui_number_sink.xml +++ b/gr-qtgui/grc/qtgui_number_sink.xml @@ -116,7 +116,7 @@ $(gui_hint()($win))</make> <key>qtgui.NUM_GRAPH_HORIZ</key> </option> <option> - <name>Verticle</name> + <name>Vertical</name> <key>qtgui.NUM_GRAPH_VERT</key> </option> <option> |