Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gnuradio-core / src / lib / filter / gr_fir_filter_fff.h

diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_fff.h b/gnuradio-core/src/lib/filter/gr_fir_filter_fff.h
index 185ad96a39d1c0db403d0b55f80a0c27ef0bfd3f..d761514486aa428c3049b4246732e4a7750bc707 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_fir_filter_fff.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_filter_fff.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,
@@ -38,7 +38,7 @@ class gr_fir_fff;
 
 /*!
  * \brief FIR filter with float input, float output and float taps
- * \ingroup filter
+ * \ingroup filter_blk
  */
 class gr_fir_filter_fff : public gr_sync_decimator
 {