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/lib/rpcserver_ice.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/lib/rpcserver_ice.cc')
| -rw-r--r-- | gnuradio-runtime/lib/rpcserver_ice.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/rpcserver_ice.cc b/gnuradio-runtime/lib/rpcserver_ice.cc index 12229a0688..2454bf2580 100644 --- a/gnuradio-runtime/lib/rpcserver_ice.cc +++ b/gnuradio-runtime/lib/rpcserver_ice.cc @@ -26,7 +26,7 @@ #include <iostream> #include <sstream> #include <stdexcept> -#include <gruel/pmt.h> +#include <pmt/pmt.h> #define DEBUG 0 |