diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-17 20:18:23 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-17 20:18:23 -0500 |
| commit | c53476e745c5f5cce564f253250a4963a275feb5 (patch) | |
| tree | 88a47e7d4c4b0b271b0774df717320a9b94d1bff /gnuradio-core/src/python | |
| parent | 25cd3358c8cdddb14fb529b52382672bd5d80696 (diff) | |
| parent | 38447cf7eabfdc02d2b75b01bca57b3350d23709 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/python/gnuradio/gr/__init__.py
Diffstat (limited to 'gnuradio-core/src/python')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/__init__.py b/gnuradio-core/src/python/gnuradio/gr/__init__.py index e4dca5d98f..c468437db7 100644 --- a/gnuradio-core/src/python/gnuradio/gr/__init__.py +++ b/gnuradio-core/src/python/gnuradio/gr/__init__.py @@ -36,4 +36,4 @@ from gateway import basic_block, sync_block, decim_block, interp_block from tag_utils import tag_to_python, tag_to_pmt # Force the preference database to be initialized -from prefs import prefs +prefs = gr_prefs.singleton |