diff options
| author | Johnathan Corgan | 2012-07-19 05:48:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-07-19 05:48:12 -0700 |
| commit | 2cb5f71bb54e6558d9435e4316eb1f0046bc8cfb (patch) | |
| tree | d283e1b00374758e9d1015128f2255a33bf42b09 /gnuradio-core/src/lib/general/general.i | |
| parent | 4e06f35f611aff2e1d4983327da54cf63e5b9ada (diff) | |
| parent | 7c8347ca47b51ddaef03ab1804a3d37716870643 (diff) | |
| download | gnuradio-2cb5f71bb54e6558d9435e4316eb1f0046bc8cfb.tar.gz gnuradio-2cb5f71bb54e6558d9435e4316eb1f0046bc8cfb.tar.bz2 gnuradio-2cb5f71bb54e6558d9435e4316eb1f0046bc8cfb.zip | |
Merge branch 'master' into wip/gr-blocks-master
Diffstat (limited to 'gnuradio-core/src/lib/general/general.i')
| -rw-r--r-- | gnuradio-core/src/lib/general/general.i | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 31acaefb8..c0ce65527 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2012 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -264,4 +264,3 @@ %include "gr_add_ff.i" %include "gr_vector_map.i" %include "gr_tag_debug.i" -%include "gr_block_gateway.i" |