Merge branch 'new_eth' of http://gnuradio.org/git/matt into new_eth

* 'new_eth' of http://gnuradio.org/git/matt:
  properly set the address filter
  stop sending short ethernet command packets.
  Fix problem with commands timing out (specifically stop_rx_streaming)
  Fix race condition that caused commands such as stop_rx_streaming to fail.
  Fixing a line in the clock recovery algorithm. This works with a bit larger error than there proably should be.
  Better fix for broken AC_PROG_F77 macro
  Fix Python header check failure due to invalid cached state
  waterfall and fft use a common autoscale function
  Fix so that the waterfall texture is initialized with a buffer of the same size.
  Modifications to usrp2 source and sink so that set center freq is called afer set lo offset.
  Modifications to the usrp blocks and wrapper so that the lo offset is set with the lo frequency.
  Removed subversion related configuration info.
  Expand frequency ranges to match hardware capability.
  Modified log power fft block so ref scale is peak to peak.
  Adding clock sync algorithm using PFB. This works, but needs a bit more work.

3 files changed, 0 insertions, 26 deletions

diff --git a/gnuradio-core/src/lib/general/gr_constants.cc.in b/gnuradio-core/src/lib/general/gr_constants.cc.in
index efb0f1c77..71a47eb51 100644
--- a/gnuradio-core/src/lib/general/gr_constants.cc.in
+++ b/gnuradio-core/src/lib/general/gr_constants.cc.in
@@ -51,18 +51,6 @@ gr_build_date()
 }
 
 const std::string
-gr_svn_date()
-{
-  return "@SVNDATE@";
-}
-
-const std::string
-gr_svn_version()
-{
-  return "@SVNVERSION@";
-}
-
-const std::string
 gr_version()
 {
   return "@VERSION@";
diff --git a/gnuradio-core/src/lib/general/gr_constants.h b/gnuradio-core/src/lib/general/gr_constants.h
index e44890be0..449d41c17 100644
--- a/gnuradio-core/src/lib/general/gr_constants.h
+++ b/gnuradio-core/src/lib/general/gr_constants.h
@@ -45,16 +45,6 @@ const std::string gr_prefsdir();
 const std::string gr_build_date();
 
 /*!
- * \brief return repository date as set when 'bootstrap' is run
- */
-const std::string gr_svn_date();
-
-/*!
- * \brief return repository version as set when 'bootstrap' is run
- */
-const std::string gr_svn_version();
-
-/*!
  * \brief return version string defined in configure.ac
  */
 const std::string gr_version();
diff --git a/gnuradio-core/src/lib/general/gr_constants.i b/gnuradio-core/src/lib/general/gr_constants.i
index 156af4a36..a5aef1492 100644
--- a/gnuradio-core/src/lib/general/gr_constants.i
+++ b/gnuradio-core/src/lib/general/gr_constants.i
@@ -4,14 +4,10 @@
 %rename(sysconfdir) gr_sysconfdir;
 %rename(prefsdir) gr_prefsdir;
 %rename(build_date) gr_build_date;
-%rename(svn_date) gr_svn_date;
-%rename(svn_version) gr_svn_version;
 %rename(version) gr_version;
 
 const std::string gr_prefix();
 const std::string gr_sysconfdir();
 const std::string gr_prefsdir();
 const std::string gr_build_date();
-const std::string gr_svn_date();
-const std::string gr_svn_version();
 const std::string gr_version();