diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-blocks/lib/qa_set_msg_handler.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/qa_set_msg_handler.cc')
| -rw-r--r-- | gr-blocks/lib/qa_set_msg_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-blocks/lib/qa_set_msg_handler.cc b/gr-blocks/lib/qa_set_msg_handler.cc index cfb990f0c4..cc94243d89 100644 --- a/gr-blocks/lib/qa_set_msg_handler.cc +++ b/gr-blocks/lib/qa_set_msg_handler.cc @@ -30,7 +30,7 @@ #include <blocks/null_source.h> #include <blocks/null_sink.h> #include <blocks/nop.h> -#include <gruel/msg_passing.h> +#include <messages/msg_passing.h> #include <iostream> #include <boost/thread/thread.hpp> |