diff options
| author | Johnathan Corgan | 2011-07-18 12:01:52 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-07-18 12:01:52 -0700 |
| commit | c067ea65d7433d4111b344ded6dfbf089062cf33 (patch) | |
| tree | a64c0ccd94d52138dfa5bd2e2d959548e124b2cf /config/Makefile.am | |
| parent | 7d328d30b395cde3bfbe5d3ee2e4ffcd46255e03 (diff) | |
| parent | c9256024ea6b6956f7969fc742d6514810db9812 (diff) | |
| download | gnuradio-c067ea65d7433d4111b344ded6dfbf089062cf33.tar.gz gnuradio-c067ea65d7433d4111b344ded6dfbf089062cf33.tar.bz2 gnuradio-c067ea65d7433d4111b344ded6dfbf089062cf33.zip | |
Merge remote branch 'ttsou/codec2' into wip/vocoders
Conflicts:
config/Makefile.am
configure.ac
Diffstat (limited to 'config/Makefile.am')
| -rw-r--r-- | config/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 3eaa5e748..20036ae5f 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -54,6 +54,7 @@ m4macros = \ grc_gr_audio.m4 \ grc_gr_comedi.m4 \ grc_gr_gcell.m4 \ + grc_gr_codec2_vocoder.m4 \ grc_gr_noaa.m4 \ grc_gr_radio_astronomy.m4 \ grc_gr_trellis.m4 \ |