diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-06 15:18:02 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-06 15:18:02 -0700 |
| commit | 03ccbeb6411c0c13adf54bde4c19372ffa141aa0 (patch) | |
| tree | b3b1c1b801495775db74b0c66f273166131b68a0 /host/test/CMakeLists.txt | |
| parent | 5fe5ff0655a410aac686d130daf9a77e39fd01b5 (diff) | |
| parent | d1711722dd432ba63b54f93d92270d4050465204 (diff) | |
| download | uhd-03ccbeb6411c0c13adf54bde4c19372ffa141aa0.tar.gz uhd-03ccbeb6411c0c13adf54bde4c19372ffa141aa0.tar.bz2 uhd-03ccbeb6411c0c13adf54bde4c19372ffa141aa0.zip | |
Merge branch 'codec_gains'
Conflicts:
host/lib/usrp/mimo_usrp.cpp
host/lib/usrp/simple_usrp.cpp
host/test/CMakeLists.txt
Diffstat (limited to 'host/test/CMakeLists.txt')
| -rw-r--r-- | host/test/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/test/CMakeLists.txt b/host/test/CMakeLists.txt index 1b909aa39..c620fd641 100644 --- a/host/test/CMakeLists.txt +++ b/host/test/CMakeLists.txt @@ -26,7 +26,7 @@ ADD_EXECUTABLE(main_test convert_types_test.cpp dict_test.cpp error_test.cpp - gain_handler_test.cpp + gain_group_test.cpp subdev_spec_test.cpp tune_helper_test.cpp vrt_test.cpp |