Merged eb/gcell -r8215:8243 into trunk. This adds gr-gcell, the GNU

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_pa_2x2_phase_combiner.h

diff --git a/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h b/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h
index e8634968bd62d597c1546737d702455926fbb981..239b463d87b9ddb682f5f2e16056f041a2c94ec3 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h
+++ b/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h
@@ -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.
  */
 #ifndef INCLUDED_GR_PA_2X2_PHASE_COMBINER_H
 #define INCLUDED_GR_PA_2X2_PHASE_COMBINER_H
@@ -31,7 +31,7 @@ gr_pa_2x2_phase_combiner_sptr gr_make_pa_2x2_phase_combiner ();
 
 /*!
  * \brief pa_2x2 phase combiner
- * \ingroup block
+ * \ingroup misc
  *
  * Anntenas are arranged like this:
  *