[Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. 3.6.1git-109-g4f9556d

[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, master has been updated
       via  4f9556dc48da8d408994cb3aa84c7dfd716b34dc (commit)
       via  95318443bc4ebc9be796f12857d6da4f59c6471d (commit)
       via  ff8b66e035aaa757969345c164ee72dd3a8fa2d8 (commit)
      from  23bb2d99edfa336fcfd9e14b0952a1a9a63e4d7b (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 4f9556dc48da8d408994cb3aa84c7dfd716b34dc
Merge: 9531844 ff8b66e
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 7 15:53:04 2012 -0400

    Merge branch 'maint'
    
    Conflicts:
        volk/gen/archs.xml

commit 95318443bc4ebc9be796f12857d6da4f59c6471d
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 7 15:52:17 2012 -0400

    volk: have an alignment even for unknown (generic) machines.

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

Summary of changes:
 volk/gen/archs.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


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