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-fcd/lib/fcd_source_c_impl.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-fcd/lib/fcd_source_c_impl.cc')
| -rw-r--r-- | gr-fcd/lib/fcd_source_c_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc index 350ba9e544..eb61183115 100644 --- a/gr-fcd/lib/fcd_source_c_impl.cc +++ b/gr-fcd/lib/fcd_source_c_impl.cc @@ -27,7 +27,7 @@ #include <fcdhidcmd.h> // needed for extended API #include <gr_io_signature.h> #include <blocks/float_to_complex.h> -#include <gruel/attributes.h> +#include <attributes.h> //#include <iostream> //using namespace std; |