diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-01 15:16:29 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-01 15:16:29 +0000 |
| commit | 8fd3ce07369a7962dc8eb5ace2007a80ad7dd907 (patch) | |
| tree | bb4f5c61f8a7809af1c58d5513dc6c3e78c7a5b2 /host/test | |
| parent | 58d71729716a688af36ba4a413e6f6ee4729eefc (diff) | |
| parent | f1f4865119605c66ffece113a621308d82512d23 (diff) | |
| download | uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.tar.gz uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.tar.bz2 uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Conflicts:
host/include/uhd/usrp/CMakeLists.txt
Diffstat (limited to 'host/test')
| -rw-r--r-- | host/test/gain_handler_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/test/gain_handler_test.cpp b/host/test/gain_handler_test.cpp index 76b065ce2..72d26e1c2 100644 --- a/host/test/gain_handler_test.cpp +++ b/host/test/gain_handler_test.cpp @@ -19,7 +19,7 @@ #include <uhd/utils/gain_handler.hpp> #include <uhd/types/ranges.hpp> #include <uhd/types/dict.hpp> -#include <uhd/props.hpp> +#include <uhd/utils/props.hpp> #include <boost/bind.hpp> #include <iostream> |