[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6git-5-g912cd08

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, next has been updated
       via  912cd08e133dae9fa9ceec055ba23cd970a0c254 (commit)
       via  9c3d747ef044e346f5c92b5aa9531e523c82ea8e (commit)
       via  ad88ab0f401c716699860b8c9deecbf5862a6993 (commit)
       via  64ce9383ad8330049dece61e6511f8c9de2b10b4 (commit)
      from  00420d32081d8252bb37142b2be19a8a7c4dc4c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 912cd08e133dae9fa9ceec055ba23cd970a0c254
Merge: 9c3d747 ad88ab0
Author: Johnathan Corgan <address@hidden>
Date:   Thu Dec 8 21:36:10 2011 -0800

    Merge branch 'master' into next

commit 9c3d747ef044e346f5c92b5aa9531e523c82ea8e
Merge: 00420d3 64ce938
Author: Johnathan Corgan <address@hidden>
Date:   Thu Dec 8 21:34:39 2011 -0800

    Merge branch 'master' into next
    
    Used -s ours to skip over version change commit

-----------------------------------------------------------------------

Summary of changes:
 gnuradio-core/src/lib/general/gr_firdes.i |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
git://gnuradio.org/gnuradio