diff options
| author | Tom Rondeau | 2011-08-30 18:02:31 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-08-30 18:02:31 -0400 |
| commit | 6ca8b00d225cb02691068510dd9069d71bcc1e62 (patch) | |
| tree | fa34e4952808f5008e5afc4883ddb9b883e77825 /gnuradio-core/src/lib/general/qa_general.cc | |
| parent | 245ef56d20f1c947e3c0f42e2edf15515e00db10 (diff) | |
| parent | b12498643aa5c11a35a484925c565a7a9e746f75 (diff) | |
| download | gnuradio-6ca8b00d225cb02691068510dd9069d71bcc1e62.tar.gz gnuradio-6ca8b00d225cb02691068510dd9069d71bcc1e62.tar.bz2 gnuradio-6ca8b00d225cb02691068510dd9069d71bcc1e62.zip | |
Merge remote branch 'mbant/cpm' into digital
Conflicts:
gnuradio-core/src/lib/general/Makefile.am
gnuradio-core/src/lib/general/general.i
gnuradio-core/src/lib/hier/Makefile.am
grc/blocks/Makefile.am
Diffstat (limited to 'gnuradio-core/src/lib/general/qa_general.cc')
| -rw-r--r-- | gnuradio-core/src/lib/general/qa_general.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/general/qa_general.cc b/gnuradio-core/src/lib/general/qa_general.cc index 6984d798c..b9080f362 100644 --- a/gnuradio-core/src/lib/general/qa_general.cc +++ b/gnuradio-core/src/lib/general/qa_general.cc @@ -28,6 +28,7 @@ #include <qa_general.h> #include <qa_gr_firdes.h> #include <qa_gr_circular_file.h> +#include <qa_gr_cpm.h> #include <qa_gr_fxpt.h> #include <qa_gr_fxpt_nco.h> #include <qa_gr_fxpt_vco.h> @@ -41,6 +42,7 @@ qa_general::suite () s->addTest (qa_gr_firdes::suite ()); s->addTest (qa_gr_circular_file::suite ()); + s->addTest (qa_gr_cpm::suite ()); s->addTest (qa_gr_fxpt::suite ()); s->addTest (qa_gr_fxpt_nco::suite ()); s->addTest (qa_gr_fxpt_vco::suite ()); |