diff options
author | Tom Rondeau | 2011-12-30 13:49:14 -0500 |
---|---|---|
committer | Tom Rondeau | 2011-12-30 13:49:14 -0500 |
commit | dd84c8dfcb30617dbac56f49a57c1e363afe643b (patch) | |
tree | e6e4e71634dc4dc3f5e85ab5ff2c92e7ada8fa78 /gr-digital/examples/CMakeLists.txt | |
parent | 0cdc6e67f575f6c86ad12734f87cf83aed72b102 (diff) | |
parent | 9838bb040af5eb21cd88dbc9aae8d4bdf2838854 (diff) | |
download | gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.tar.gz gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.tar.bz2 gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.zip |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/Makefile.am
gr-digital/include/Makefile.am
gr-digital/lib/Makefile.am
gr-digital/python/Makefile.am
gr-digital/swig/Makefile.am
Diffstat (limited to 'gr-digital/examples/CMakeLists.txt')
-rw-r--r-- | gr-digital/examples/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt index 2645557cc..7b94f745c 100644 --- a/gr-digital/examples/CMakeLists.txt +++ b/gr-digital/examples/CMakeLists.txt @@ -25,6 +25,7 @@ GR_PYTHON_INSTALL(PROGRAMS example_timing.py run_length.py gen_whitener.py + snr_estimators.py DESTINATION ${GR_PKG_DATA_DIR}/examples/digital COMPONENT "digital_python" ) |