* ets/grc-usrp2-clock-source:
  Add USRP2 clock source parameter to GRC blocks.

* gnuradio/wip/udp_source_sink:
  gnuradio-core: update copyrights
  gnuradio-core: allow swig to handle exceptions in UDP source/sink
  grc: update UDP source and sink block wrappers
  Simplify USE_SELECT usage
  Return immediately when using d_residual.
  Defend against a peer that sends an invalid message length.
  Move initialization of select timeout
  Correct update of d_temp_offset (parallel construction)
  Identify memory leaks that occur on error conditions
  Use -1 as file descriptor "not open" value instead of 0
  Add additional conditionalization of networking includes
  Flush pending errors in gr_udp_sink on disconnect()
  Rework UDP source and sink, with incompatible API changes
  Updates to udp source/sink (select(), wait, cleanup)
  Discard data in gr_udp_sink until receiver is started.
  Use getaddrinfo in gr_udp_{source,sink}
  Changes to gr_udp_{source,sink} for MinGW
  Ignore ENOPROTOOPT return from setsockopt(SO_LINGER)

libvrt will continue as part of the 3.4git development branch, where
it will undergo a rewrite and API change.

(Otherwise recv may overwrite valid data in d_temp_buff.)

This change resolves a conflict with the Generic Colorizer application
which also uses the binary name 'grc'.

Interested users can add an alias to their shell environment to run
gnuradio-companion when grc is invoked.

* wip/burx_support:
  -Updated to allow BURX support to be built into standard txrx.bin
  Once and for all, here is the properly updated Makefile.am for the apps
  Updated db_bitshark_rx.c to the proper version that includes the
  Change default bandwidth to 25 MHz to match maximum USRP2 bandwidth
  Update incorrectly checked in Makefile.am
  usrp: Cleanup for merge of bitshark daughterboard code
  Including bitshark_rx.h header file for USRP2 build
  Fixed issue with with wrong Makefile.am files being copied
  Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP2.
  Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1.

image
-Also corrected db_bitshark_rx.c to the current version (previous
git push error) that includes the needed delays after I2C commands

This reverts commit 026f691a.

This reverts commit 3f1940cf.

* bitshark/burx_support:
  Once and for all, here is the properly updated Makefile.am for the apps
  Updated db_bitshark_rx.c to the proper version that includes the

Conflicts:
	usrp2/firmware/lib/db_bitshark_rx.c

Don Ward:

"The supplied version of ltmain.sh does not handle interlibrary
dependencies on Windows. I have attached a diff file showing
the slight differences between the ltmain.sh in the tarball
(2.2.6b Debian-2.2.6b-2ubuntu1, which fails) and the ltmain.sh
downloaded from packages.debian.org  (plain 2.26b).  It looks
like it was broken in Ubuntu 2.2.6a-3 (change log says "Don't
pull in depedency libs when linking a binary"). GNU Radio builds
ok if I run ./bootstrap locally."

JMC: This file (ltmain.sh) has not previously been under version
control and would be copied over (or symlinked) by the bootstrap
process. With a version now in the repository, we'll need to
ensure it stays fresh, likely at the same time we check for
updated config.guess and config.sub files.

There is some breakage with GR_FORTRAN / AC_PROG_F77 when running
bootstrap.  The gen_interpolator_taps binary is only needed to
regenerate the MMSE interpolator taps, which hasn't been done for
several years.  Disable this until proper fix can be done.

directory...

delays when sending back-to-back I2C commands, as well as the proper
command when setting the bw (previous blunder with git resulted in
the wrong version on this branch)