diff options
author | Matt Ettus | 2009-09-24 22:34:06 -0700 |
---|---|---|
committer | Matt Ettus | 2009-09-24 22:34:06 -0700 |
commit | 5c46578ba936de57e80594540804c964aa408f73 (patch) | |
tree | cf164f8e3d80b78971fb2987740b7d957ee1f306 /gnuradio-examples/python/digital/Makefile.am | |
parent | 35ada01aa8ae838d6d75bf063725218fa7e18f5f (diff) | |
parent | 16474a0adb44dc81a8338a9c4a9a6dcab6f6328f (diff) | |
download | gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.gz gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.bz2 gnuradio-5c46578ba936de57e80594540804c964aa408f73.zip |
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Diffstat (limited to 'gnuradio-examples/python/digital/Makefile.am')
-rw-r--r-- | gnuradio-examples/python/digital/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am index 64ce4ec46..e32180cd4 100644 --- a/gnuradio-examples/python/digital/Makefile.am +++ b/gnuradio-examples/python/digital/Makefile.am @@ -25,7 +25,6 @@ ourdatadir = $(exampledir)/digital dist_ourdata_DATA = \ README \ - generic_usrp.py \ pick_bitrate.py \ qt_digital_window.ui \ qt_digital_window.py \ @@ -33,7 +32,6 @@ dist_ourdata_DATA = \ qt_rx_window.py \ receive_path.py \ transmit_path.py \ - usrp_options.py \ usrp_receive_path.py \ usrp_transmit_path.py |