diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 17:12:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 17:12:05 -0700 |
| commit | b63e8cf03236257730680adfd75378daf3f5c153 (patch) | |
| tree | 0cb65a8bc2e2d8e8ed9ea6c880f991c4eed4e299 /gr-uhd | |
| parent | e4783ab3f1541d8ba32c0269eb30b7c06d0888c2 (diff) | |
| parent | 1d537a26b27b9d3ce6a3affc6ea500a9efc5a867 (diff) | |
Merge branch 'next' into python3
Conflicts:
gnuradio-runtime/python/gnuradio/gr/tag_utils.py
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/apps/uhd_app.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-uhd/apps/uhd_app.py b/gr-uhd/apps/uhd_app.py index a754f01e16..a238ebcf4c 100644 --- a/gr-uhd/apps/uhd_app.py +++ b/gr-uhd/apps/uhd_app.py @@ -127,6 +127,7 @@ class UHDApp(object): raise ValueError("Invalid {m} setting for {n} {b}: {a}".format( m=arg_name, n=num, a=arg, b=num_name )) + return args def async_callback(self, msg): |