diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-23 09:52:29 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-23 09:52:29 -0700 |
| commit | 1904b3817207810031b95efca0fd59406a7fe661 (patch) | |
| tree | 1303a1e7fae0b44817a71e13b61d10b5385315d3 /gr-trellis | |
| parent | 2165d0c4ce0d0555b17682a2d0a9741a1f2a5a25 (diff) | |
| parent | dcee8e7416b849234bc09e1ae8a2acb1d3d21e3a (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts:
gr-trellis/src/lib/trellis_constellation_metrics_cf.cc
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/src/lib/trellis_constellation_metrics_cf.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc index ec4859ba0b..91520e4ce4 100644 --- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc +++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc @@ -20,8 +20,6 @@ * Boston, MA 02110-1301, USA. */ -// WARNING: this file is machine generated. Edits will be over written - #ifdef HAVE_CONFIG_H #include "config.h" #endif |