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 /gnuradio-runtime/include/gr_feval.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/include/gr_feval.h')
| -rw-r--r-- | gnuradio-runtime/include/gr_feval.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/include/gr_feval.h b/gnuradio-runtime/include/gr_feval.h index af11ca2a2a..07df592e58 100644 --- a/gnuradio-runtime/include/gr_feval.h +++ b/gnuradio-runtime/include/gr_feval.h @@ -24,7 +24,7 @@ #include <gr_runtime_api.h> #include <gr_complex.h> -#include <gruel/pmt.h> +#include <pmt/pmt.h> /*! * \brief base class for evaluating a function: double -> double |