diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:27:37 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:27:37 -0700 |
commit | 83912104a9c1ab3631f755a4d98ee86e195db690 (patch) | |
tree | 4c7ba7da761b1b9b5508bffdb77b9e0696ff46ae /host/examples/CMakeLists.txt | |
parent | 670eeda6e4c9ff2ab81f4e387bce49ea4dc79dcc (diff) | |
parent | 065065e90ce970f8eed0941ded6ae4377e649c2b (diff) | |
download | uhd-83912104a9c1ab3631f755a4d98ee86e195db690.tar.gz uhd-83912104a9c1ab3631f755a4d98ee86e195db690.tar.bz2 uhd-83912104a9c1ab3631f755a4d98ee86e195db690.zip |
Merge branch 'UHD-3.9.LTS' into maint
This provides the GPS fixes.
Conflicts:
host/CMakeLists.txt
tools/debs/upload_debs.sh
Diffstat (limited to 'host/examples/CMakeLists.txt')
-rw-r--r-- | host/examples/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/examples/CMakeLists.txt b/host/examples/CMakeLists.txt index 43e0db9c0..e61fd897f 100644 --- a/host/examples/CMakeLists.txt +++ b/host/examples/CMakeLists.txt @@ -36,6 +36,7 @@ SET(example_sources txrx_loopback_to_file.cpp latency_test.cpp gpio.cpp + sync_to_gps.cpp ) IF(ENABLE_OCTOCLOCK) |