diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-06 09:32:21 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-06 09:32:21 -0700 |
| commit | 91e8ecdcb55a224e1572dca5f920b4b2d347cb77 (patch) | |
| tree | b8702b972de819733cfad105bde22b9fd43212c3 /gnuradio-runtime/lib/scheduler.h | |
| parent | e89c1dcdf98281a84f0fb4070ca3b56baf5743e6 (diff) | |
| parent | 0f61e4e150359d4e68439085a5489f96df04f685 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-utils/python/modtool/templates.py
Diffstat (limited to 'gnuradio-runtime/lib/scheduler.h')
| -rw-r--r-- | gnuradio-runtime/lib/scheduler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/scheduler.h b/gnuradio-runtime/lib/scheduler.h index 575862b27d..0924808965 100644 --- a/gnuradio-runtime/lib/scheduler.h +++ b/gnuradio-runtime/lib/scheduler.h @@ -45,7 +45,7 @@ namespace gr { /*! * \brief Construct a scheduler and begin evaluating the graph. * - * The scheduler will continue running until all blocks until they + * The scheduler will continue running until all blocks * report that they are done or the stop method is called. */ scheduler(flat_flowgraph_sptr ffg, int max_noutput_items); |