Merge branch 'grc' of http://gnuradio.org/git/jblum into master
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 24 Sep 2009 01:15:59 +0000 (18:15 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 24 Sep 2009 01:15:59 +0000 (18:15 -0700)
commit18cd6228abbd66d5be283745b5e8f8fca94c3ad2
treead4498ed04eb5afbb62ed34119c5657075e9b531
parent7d8dd5e122e0201d96410eec6549b903881f8b3a
parent803943020c3d53686f2b65a70cd24a780b46c925
Merge branch 'grc' of gnuradio.org/git/jblum into master

* 'grc' of http://gnuradio.org/git/jblum:
  xor that hash
  bug fix for handling loading of dynamic params