Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gr-trellis / src / lib / trellis_encoder_si.i

diff --git a/gr-trellis/src/lib/trellis_encoder_si.i b/gr-trellis/src/lib/trellis_encoder_si.i
index 0d8a16bdcbc51178c608767ca31fd620126f5c45..0355681cc503dc5388e39a56a303d1eca5982aae 100644 (file)
--- a/gr-trellis/src/lib/trellis_encoder_si.i
+++ b/gr-trellis/src/lib/trellis_encoder_si.i
@@ -6,7 +6,7 @@
  *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * GNU Radio is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 
 // WARNING: this file is machine generated.  Edits will be over written