summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2011-06-07 21:06:33 -0400
committerTom Rondeau2011-06-07 21:06:33 -0400
commit275d14afc2b2f4088db204213cf14ab75499cc4e (patch)
treee328ddd7e7c2af8e71a5ebb465579b117946880c
parent233f960474f86bc8cc519ce7257b29d8615c4000 (diff)
parent54301ae213e065c216c2389c64fd6cdb0f64cfea (diff)
downloadgnuradio-275d14afc2b2f4088db204213cf14ab75499cc4e.tar.gz
gnuradio-275d14afc2b2f4088db204213cf14ab75499cc4e.tar.bz2
gnuradio-275d14afc2b2f4088db204213cf14ab75499cc4e.zip
Merge branch 'mergeme/fix/trellis/metrics_typo'
-rw-r--r--gr-trellis/src/lib/trellis_metrics_X.cc.t2
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/trellis_metrics_X.cc.t b/gr-trellis/src/lib/trellis_metrics_X.cc.t
index 4bdaabc22..cd66df6fb 100644
--- a/gr-trellis/src/lib/trellis_metrics_X.cc.t
+++ b/gr-trellis/src/lib/trellis_metrics_X.cc.t
@@ -22,7 +22,7 @@
// @WARNING@
-#ifndef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#include "config.h"
#endif