summaryrefslogtreecommitdiff
path: root/gr-trellis
diff options
context:
space:
mode:
authorJohnathan Corgan2011-10-29 11:08:28 -0700
committerJohnathan Corgan2011-10-29 11:08:28 -0700
commit7dcb1c86180afadda9e015c3806c4fb49a0cdfea (patch)
treeb6d8916b881e0bded909a8cf2685bc314f888614 /gr-trellis
parent8fd12ea87d77fd8f36c84aa75de58eeee22bfe3f (diff)
parent8357aa3c88926f8e1b77f6e9aeff91e34402349f (diff)
downloadgnuradio-7dcb1c86180afadda9e015c3806c4fb49a0cdfea.tar.gz
gnuradio-7dcb1c86180afadda9e015c3806c4fb49a0cdfea.tar.bz2
gnuradio-7dcb1c86180afadda9e015c3806c4fb49a0cdfea.zip
Merge remote branch 'gnuradio/master'
Diffstat (limited to 'gr-trellis')
-rw-r--r--gr-trellis/src/lib/.gitignore18
1 files changed, 18 insertions, 0 deletions
diff --git a/gr-trellis/src/lib/.gitignore b/gr-trellis/src/lib/.gitignore
index 816b0aab8..7a866aead 100644
--- a/gr-trellis/src/lib/.gitignore
+++ b/gr-trellis/src/lib/.gitignore
@@ -166,6 +166,24 @@
/trellis_pccc_encoder_ss.cc
/trellis_pccc_encoder_ss.h
/trellis_pccc_encoder_ss.i
+/trellis_pccc_decoder_combined_cb.cc
+/trellis_pccc_decoder_combined_cb.h
+/trellis_pccc_decoder_combined_cb.i
+/trellis_pccc_decoder_combined_ci.cc
+/trellis_pccc_decoder_combined_ci.h
+/trellis_pccc_decoder_combined_ci.i
+/trellis_pccc_decoder_combined_cs.cc
+/trellis_pccc_decoder_combined_cs.h
+/trellis_pccc_decoder_combined_cs.i
+/trellis_pccc_decoder_combined_fb.cc
+/trellis_pccc_decoder_combined_fb.h
+/trellis_pccc_decoder_combined_fb.i
+/trellis_pccc_decoder_combined_fi.cc
+/trellis_pccc_decoder_combined_fi.h
+/trellis_pccc_decoder_combined_fi.i
+/trellis_pccc_decoder_combined_fs.cc
+/trellis_pccc_decoder_combined_fs.h
+/trellis_pccc_decoder_combined_fs.i
/trellis_generated.i
/generate-stamp
/stamp-*