[Commit-gnuradio] git://gnuradio.org/jcorgan branch, gr-wavelet, created. v3.5.2.1-198-gf9b73b1

[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/jcorgan".

The branch, gr-wavelet has been created
        at  f9b73b1710f19529b99f8f69c8e3a06839ad68bc (commit)

- Log -----------------------------------------------------------------
commit f9b73b1710f19529b99f8f69c8e3a06839ad68bc
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 1 13:23:06 2012 -0700

    wavelet: move wavelet blocks to new top-level component

commit a40ac1d61259dda14e5a6abf328004d3f4b17f02
Merge: bd7b4a5 86321b2
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 1 11:00:07 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-fcd/lib/Makefile.am

commit 86321b24cff6df788e12436ca62bde22effdb4c2
Merge: 1aecf53 c39f848
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 1 10:46:01 2012 -0700

    Merge remote branch 'jcorgan/gr-fcd'

commit bd7b4a566da02a3e68857c7f5a6963a132a2f2d2
Merge: 16d63a5 1aecf53
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 23:30:52 2012 -0400

    Merge branch 'master' into next

commit 1aecf53489a4fa76f6a818c170941faa1d02c43a
Merge: 9fa5e85 c774e6e
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 23:02:39 2012 -0400

    Merge branch 'maint'

commit c774e6efb5f715c5f8b5f20bd8dea0051da667fd
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 22:04:44 2012 -0400

    doc: fix documentation for wavsink (thanks to John Coppens for point it 
out).

commit 170c4ba4b39889073b2a3f129e77ca9b2f91bbf2
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 14:14:03 2012 -0400

    core: when reseting buffers, make sure that the read/write pointers are 
always algined.
    
    This fixes problems when disconnecting and reconnecting blocks to a 
flowgraph.

commit 9fa5e8512d00e4664100010573e4597f07e02c1f
Merge: 8bfb47d bcf4469
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 21:51:19 2012 -0400

    Merge branch 'ch_bw'

commit 8bfb47dd8fb661039bdfdc475047e6f983f11270
Merge: da09d2b 79e341d
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 21:46:48 2012 -0400

    Merge branch 'master' of gnuradio.org:gnuradio

commit 16d63a572c8022766063d2d601e9a635f92871ce
Merge: e91ae54 79e341d
Author: Johnathan Corgan <address@hidden>
Date:   Tue Mar 27 14:28:48 2012 -0700

    Merge branch 'master' into next

commit 79e341d9064b8e44c2d1900cb34ddb51deebb559
Merge: 87c8751 d346cb2
Author: Johnathan Corgan <address@hidden>
Date:   Tue Mar 27 14:28:42 2012 -0700

    Merge branch 'maint'

commit d346cb287299a04a71ea21007025edb694409043
Author: Josh Blum <address@hidden>
Date:   Tue Mar 27 11:17:04 2012 -0700

    uhd: fix dc offset call in uhd source
    
    SWIG/python cannot differentiate the calls set_dc_offset
    with an complex number or a boolean paramater.
    It seems to take the boolean as a complex number 1 or 0.
    
    Since the overloading is not working right:
    renamed set_dc_offset to set_auto_dc_offset
    for the boolean enable/disable paramater

commit e91ae54188e9812f3d8ed45e7f675e5a98ec889f
Merge: 7eebbcd 87c8751
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 24 10:19:49 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-uhd/lib/Makefile.am

commit 87c8751c99cfb2191bea19557d158fdd952c56eb
Merge: 60e3104 0aeee7f
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 24 10:19:10 2012 -0700

    Merge remote branch 'jblum/mergeme_uhd'

commit 60e31043e2fc5e44d1376725addd485d183c7d1c
Merge: ad6cdc5 f06bc44
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 24 10:18:49 2012 -0700

    Merge branch 'maint'

commit f06bc44e150fbec00200ed98cf80cc384ec6dac2
Merge: aa856c3 708b7e4
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 24 10:18:28 2012 -0700

    Merge remote branch 'jblum/fix_uhd_device_addr_python' into maint

commit 7eebbcd5ed9f94904adf99967c928ec736779a4a
Merge: 4877256 ad6cdc5
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 23 17:38:08 2012 -0700

    Merge branch 'master' into next

commit ad6cdc58ba4ef740af08efa6e220e2345e77d3d9
Merge: 47315e9 aa856c3
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 23 17:38:02 2012 -0700

    Merge branch 'maint'

commit aa856c3922c806899a09c40d2d48870e70ddc3e9
Author: Nicholas Corgan <address@hidden>
Date:   Fri Mar 23 17:10:16 2012 -0700

    Changes preinst.in from running 'ls' to running 'echo'

commit 0aeee7ffb7c7244c97766681a134db2d46ab6d43
Author: Josh Blum <address@hidden>
Date:   Fri Mar 23 14:02:21 2012 -0700

    uhd: finite_acquisition_v timeout should be >> than stream time

commit 38d0c4cff7aa26567c3fb2fb55002de8627aa044
Author: Josh Blum <address@hidden>
Date:   Fri Mar 23 13:53:47 2012 -0700

    uhd: add a flush to finite_acquisition_v

commit 90213d65782dbbc612494ed28568e23b42961488
Author: Josh Blum <address@hidden>
Date:   Thu Mar 22 15:30:56 2012 -0700

    uhd: perform abi compat check before making a block

commit a751e4884d918c079d07d3108f5561ac43c3553e
Author: Josh Blum <address@hidden>
Date:   Mon Mar 19 10:34:48 2012 -0700

    uhd: added set_start_time calls to source/sink

commit 7954c7dbfe5267cc3504598410b8ea73bef34fe5
Author: Josh Blum <address@hidden>
Date:   Fri Mar 16 15:38:11 2012 -0700

    uhd: added multi-finite-aquisition

commit 708b7e46a9407710f9aab9444561d464fa56c9b9
Author: Josh Blum <address@hidden>
Date:   Fri Mar 16 15:37:44 2012 -0700

    uhd: fix device_addr init issue

commit c39f8485e2f018363403336154ee30ea904e79a6
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 23 14:04:48 2012 -0700

    fcd: convert to private implementation pattern

commit 4877256972c32ddbb1b92e0ac95f71ad7607dd46
Merge: 2e5519b 47315e9
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 23 12:07:23 2012 -0700

    Merge branch 'master' into next

commit 2e5519b642217fc83324360596ea834cff414ce3
Merge: a214995 fc115e6
Author: Johnathan Corgan <address@hidden>
Date:   Thu Mar 22 15:24:38 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        config/Makefile.am
        configure.ac

commit a21499503e97189644b882ec12210ed4fa501414
Merge: b62700a 69c9100
Author: Johnathan Corgan <address@hidden>
Date:   Thu Mar 22 15:07:04 2012 -0700

    Merge branch 'master' into next

commit da09d2b000606b55f564bc6adaa945968d6c3e72
Author: Tom Rondeau <address@hidden>
Date:   Thu Mar 22 16:21:03 2012 -0400

    volk: make both test cases look and function the same.

commit b62700ab8fad6343378b816a2e4f88170bf7d8dd
Merge: abc7967 314916c
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 20 19:57:18 2012 -0400

    Merge branch 'master' into next

commit bcf44690b9f9bce5cfaefcf383620f709521ad24
Author: Tom Rondeau <address@hidden>
Date:   Mon Mar 19 15:09:48 2012 -0400

    digital: in narrowband examples, added the ability to change the channel 
bandwidth.
    
    When the frequency factor is off significantly, the signal can be outside 
the range
    of the channel filter. This allows a user to open up the filter to acquire 
these signals.

commit abc796707426337f408166b44251c6ca1bc5d20f
Merge: b05ac49 77834b2
Author: Tom Rondeau <address@hidden>
Date:   Mon Mar 19 13:56:21 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        volk/config/orc.m4

commit b05ac49ced6a9b4cd4e4ba2d0a3ed74b6979dcc8
Merge: 70c625e bbddd08
Author: Tom Rondeau <address@hidden>
Date:   Sun Mar 18 20:05:21 2012 -0400

    Merge branch 'master' into next

commit 70c625e9cec45bb8d2c31a0d3db0068c529f39fb
Merge: 2273c29 c138b94
Author: Johnathan Corgan <address@hidden>
Date:   Sun Mar 18 13:31:15 2012 -0700

    Merge branch 'master' into next

commit 2273c29ef83f420b69c233e8c59a190786965256
Merge: 710f3dc 3e4924f
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 17 11:26:26 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        config/grc_gruel.m4

commit 710f3dccddcd1096e3b14899d589b96da39c1dd8
Merge: fcdac04 7e2d501
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 16 14:43:18 2012 -0700

    Merge branch 'master' into next

commit fcdac045ad64099949dbbefff25832a6dcef3187
Merge: b5dbeb3 74f7c07
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 16 16:57:38 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gruel/src/swig/Makefile.am

commit b5dbeb3f02b7e230f0e8fd49640047a04c6908b6
Merge: 8b63090 b42436c
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 16 14:17:02 2012 -0400

    Merge branch 'master' into next

commit 8b63090ba35fb29f583f0c06d31804951b5f643e
Merge: ac9cd0e c095de4
Author: Johnathan Corgan <address@hidden>
Date:   Thu Mar 15 16:48:03 2012 -0700

    Merge branch 'master' into next

commit ac9cd0eba188e25d724878f3071a30ae6da47e48
Merge: c4c985b 29ac4f1
Author: Tom Rondeau <address@hidden>
Date:   Thu Mar 15 18:03:49 2012 -0400

    Merge branch 'master' into next

commit c4c985b2aed889bc49a4e30b1e8866bb214b03a2
Merge: 2de96be 263bdb4
Author: Johnathan Corgan <address@hidden>
Date:   Thu Mar 15 15:00:04 2012 -0700

    Merge branch 'master' into next

commit 2de96be2ce56dc258714fcb2ef87e8cda03f72f7
Merge: 6085928 4310205
Author: Johnathan Corgan <address@hidden>
Date:   Thu Mar 15 08:49:23 2012 -0700

    Merge branch 'master' into next

commit 608592851b23fd05b50aa128d12624877c08518e
Merge: c732888 295a0da
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 13 18:33:04 2012 -0400

    Merge branch 'master' into next

commit c7328884281802be7fd973fe8150cabe72f81cf9
Merge: 2d54dd6 0d6871b
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 13 12:00:38 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/Makefile.am
        gnuradio-core/src/lib/gengen/.gitignore
        gnuradio-core/src/lib/gengen/Makefile.am
        gnuradio-core/src/python/gnuradio/gr/Makefile.am

commit 2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec
Merge: bbfe6d6 7a3a0b5
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 12 09:58:01 2012 -0700

    Merge branch 'master' into next

commit bbfe6d614e38ceb0fe8efbe8a5927d92ca9c72b1
Merge: 3fec740 502d746
Author: Tom Rondeau <address@hidden>
Date:   Sat Mar 10 07:58:17 2012 -0500

    Merge branch 'master' into next

commit 3fec74030bd0de7b182d982193fd93252dbb52dc
Merge: 5c86c07 aabc6bd
Author: Johnathan Corgan <address@hidden>
Date:   Thu Mar 8 16:49:08 2012 -0800

    Merge branch 'master' into next

commit 5c86c074b437f619754d90af0722ee03754e0aa9
Merge: 22d1f5c 57ad294
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 5 11:53:25 2012 -0800

    Merge branch 'master' into next
    
    Use merge strategy '-s ours' to skip release commits.

commit 22d1f5c3db78db84237041346cc4e72382fa658f
Merge: e0f885c 1864683
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 5 11:53:14 2012 -0800

    Merge remote branch 'gnuradio/master' into next

commit e0f885c8325f164334030429ae731e613de9add2
Merge: c53529f 4f0add1
Author: Tom Rondeau <address@hidden>
Date:   Sat Mar 3 10:27:15 2012 -0500

    Merge branch 'master' into next

commit c53529ff00012646f4aa47e820bddd48995ab094
Author: Tom Rondeau <address@hidden>
Date:   Sat Mar 3 10:11:28 2012 -0500

    volk: include config.h to have rintf in windows/msvc.

commit b0f3db9a0785d69d004d65054bb70a4dd70dcb65
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 2 16:21:30 2012 -0500

    grc: updating to new name of pfb synthesizer block.

commit d1f1c53fbc8ac7b8146af51cb104acb07cb7bdb2
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 2 16:15:31 2012 -0500

    examples: fixing synthesizer examples to use new block name.

commit 749b27b25818a292f6484c25501fad0faf748f6c
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 2 16:10:53 2012 -0500

    core: changed name of gr_pfb_synthesis_filterbank_ccf to gr_pfb_synthesizer 
to make it easier to write and remember.

commit 875f5185a7feecbb1d4a3426a443bd873b0abd4b
Merge: bc5494f 0a6f149
Author: Johnathan Corgan <address@hidden>
Date:   Thu Mar 1 17:02:07 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        config/grc_volk.m4
        gnuradio-core/src/guile/tests/gengen_ctors.test
        gnuradio-core/src/lib/Makefile.am
        gnuradio-core/src/lib/general/.gitignore
        gnuradio-core/src/lib/general/Makefile.am
        gnuradio-core/src/lib/gengen/.gitignore
        gnuradio-core/src/python/gnuradio/gr/Makefile.am
        volk/include/volk/Makefile.am

commit bc5494fc83721b22b5c6a94e1300e112d6269313
Merge: 0f73b09 088ca3e
Author: Tom Rondeau <address@hidden>
Date:   Thu Mar 1 11:28:04 2012 -0500

    Merge branch 'master' into next

commit 0f73b0991f4da55b118b4029e2e53fde64580caa
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 29 20:42:17 2012 -0500

    grc: grc PFB channelizer and synthesize to set channel map defaults on 
startup.

commit ed72fd930b6c7c23273c928d02b54587c0cac9a3
Merge: 030cfac 4c509e6
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 29 11:51:19 2012 -0800

    Merge branch 'master' into next

commit 030cfac62db69b8eb19ae5a79ae6ec71d113b47b
Merge: 06b9d21 91bbef4
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 28 23:56:28 2012 -0500

    Merge branch 'synth' into next

commit 06b9d21dac84b97b8da1a72547bf936f30fe8340
Merge: de9ac76 d71f510
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 28 23:56:01 2012 -0500

    Merge branch 'next' of gnuradio.org:gnuradio into next

commit 91bbef469b054dfd56c03d9fc027972ec102a4a9
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 28 23:55:38 2012 -0500

    grc: adding new inputs to channelizer and synthesizer xml.

commit d71f5104ab3f4f8ec7292c3358670e6b8ce10fa7
Merge: 2dfcc2d 0750b35
Author: Johnathan Corgan <address@hidden>
Date:   Tue Feb 28 19:09:01 2012 -0800

    Merge branch 'master' into next

commit 68a36d3e2c78d477e9c793df9ec9f540aa5f327d
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 28 16:24:43 2012 -0500

    core: simple formatting.

commit 47d6864ea92cf10899d7beebf2cb15eb08c140f2
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 28 16:23:52 2012 -0500

    examples: adding an example of using the channelizer and synthesize 
together to reconstruct a signal.

commit 3d3d3c05291aebb1ad90d22f9674546347cb96d6
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 28 16:02:16 2012 -0500

    core: pfb channelizer: can now set a channel map to direct the channels to 
a specific output stream.
    
    Now, not all output channels must be connected; can connect M of N channels 
(M <= N) and use the channel_map to set which channel from the original 
wideband signal go to which output streams.

commit d15bed21e08f97b0ac510b49124c9231289820c2
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 28 12:36:00 2012 -0500

    core: pfb synth: can now set channel map and to use 1 or 2 sps on output.
    
    The channel map allows the user to set the streams anywhere in the channel 
output.

commit dd4cc588d7a34f82a63c6b23ca7a1fab736bfc10
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 20 10:12:57 2012 -0500

    core: wip on pfb synthesis. It works, but is a bit hacked together.
    
    Need to determine the best way to handle the two filter cases, with and 
without oversampling.

commit de9ac7602116aab499b7f05a17de7f8d17e9657a
Merge: 356bc1a 2dfcc2d
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 27 16:16:26 2012 -0500

    Merge branch 'next' of gnuradio.org:gnuradio into next

commit 2dfcc2dc875ae82c45ab32cd34d170dc20424fc7
Merge: 739ac87 e0dec91
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 27 13:06:27 2012 -0800

    Merge branch 'master' into next

commit 356bc1a466d9c0f8977dc424a3eea3574c91e1c3
Merge: 739ac87 f2d8381
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 27 16:02:53 2012 -0500

    Merge branch 'master' into next

commit 739ac87e34242b0fbcccb4a8b10d3eb16ec2723d
Merge: 399bf08 cff2b9c
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 27 13:05:09 2012 -0500

    Merge branch 'master' into next

commit 399bf08bf0b61f599001c990d3c0cfd24cc368f6
Merge: 49bba63 314bc60
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 26 15:43:24 2012 -0800

    Merge branch 'master' into next

commit 49bba6365830b1ec66caa28c67be49d2ab091d9e
Merge: e5bf23d ee91264
Author: Tom Rondeau <address@hidden>
Date:   Fri Feb 24 15:59:20 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/grc/Makefile.am

commit e5bf23ddd93ba33fe92a835b24482fd4cf9ec3aa
Merge: 059e79a dc963e9
Author: Tom Rondeau <address@hidden>
Date:   Thu Feb 23 13:55:24 2012 -0500

    Merge branch 'master' into next

commit 059e79a6c66fa8fae4fc92ca7283c7a07989232f
Merge: 5977d90 7298614
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 21 22:53:20 2012 -0500

    Merge branch 'master' into next

commit 5977d9006bd7c81a35e347f946e5e7983145ff0c
Author: Marcus Leech <address@hidden>
Date:   Mon Feb 20 17:34:01 2012 -0500

    uhd: updated uhd programs to use stream_args concept from command line for 
more than just setting the scalar.

commit 991c8f4bb0c897decb0a62d15b3e44316a46cf95
Merge: 8a4a83a e4693df
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 20 10:17:59 2012 -0500

    Merge branch 'master' into next

commit 8a4a83a768d205a28b8deced03a0ed4289e6f60f
Merge: 748e3e8 34508cd
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 17 13:51:00 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-vocoder/grc/Makefile.am
        grc/blocks/Makefile.am

commit 748e3e84fe921cf03adbd9f411105af6202df763
Merge: b0f11a1 fed443d
Author: Tom Rondeau <address@hidden>
Date:   Fri Feb 17 15:41:06 2012 -0500

    Merge branch 'master' into next

commit b0f11a1d6f2d25528c820cab2bc2065e4f258854
Merge: 9eec189 3b3b7e3
Author: Tom Rondeau <address@hidden>
Date:   Fri Feb 17 10:30:19 2012 -0500

    Merge branch 'next' of gnuradio.org:gnuradio into next

commit 9eec189978d7e3a5b67da21191b391e464561816
Author: Tom Rondeau <address@hidden>
Date:   Fri Feb 17 10:28:46 2012 -0500

    howto: moving uninstall rules into correct location.

commit 3b3b7e31814ff0af2a017263d16f9af6bf8a3f18
Merge: c051c0f 2fc3ae3
Author: Johnathan Corgan <address@hidden>
Date:   Thu Feb 16 10:13:49 2012 -0800

    Merge branch 'master' into next

commit c051c0f0ca8def9a58377f167eb11b78c5e9cd12
Merge: 37021a4 d545481
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 15 22:45:08 2012 -0500

    Merge branch 'master' into next

commit 37021a4c1393026de88725565ba23ebd6d0cc4d9
Merge: 3222590 dc266ca
Author: Johnathan Corgan <address@hidden>
Date:   Tue Feb 14 11:23:42 2012 -0800

    Merge branch 'master' into next

commit 32225905cb4fef7364668fffc16c808ac6c3bee8
Merge: 665f4e0 1c41758
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 14 09:35:17 2012 -0500

    Merge branch 'master' into next

commit 665f4e0ecbdae17cbb0ee84a1a5b7ee37594c544
Merge: 5c36c2d 6410e39
Author: Tom Rondeau <address@hidden>
Date:   Fri Feb 10 11:16:13 2012 -0500

    Merge branch 'master' into next

commit 5c36c2dd5aa47acfb678595ad69792affd13bfbf
Merge: 41107df 39f86af
Author: Tom Rondeau <address@hidden>
Date:   Fri Feb 10 11:14:28 2012 -0500

    Merge branch 'master' into next

commit 41107dfc64e460d2a71536a1f16d69bb68e1960d
Merge: 83c5a8a c2c8a53
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 8 19:49:42 2012 -0500

    Merge branch 'master' into next

commit 83c5a8a66d619423beec55f689640a89e2bd762b
Merge: 10ece2b f12f7ba
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 7 13:18:47 2012 -0500

    Merge branch 'master' into next

commit 10ece2bbb3d2ba34ea18dadfb06ce6e6fd1ae6c3
Merge: b5eebec 35b689e
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 22:23:45 2012 -0500

    Merge branch 'master' into next

commit b5eebec60f4802e2be0e0ef51084f4f008ef60d7
Merge: f216463 110cb25
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 17:07:23 2012 -0800

    Merge branch 'master' into next

commit f2164639dffd6d43c07206342fa775c780c77646
Merge: 47b79cb b4be410
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 14:59:01 2012 -0800

    Merge branch 'master' into next

commit 47b79cb6ed9544df04efe3f5e84003b6d8234024
Merge: 17bb7b9 895bb2f
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 17:33:50 2012 -0500

    Merge branch 'master' into next

commit 17bb7b9dd517d5191f89ccf04fe906d2457b5c1b
Merge: 9bbedbb 50faa5c
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 13:45:44 2012 -0800

    Merge branch 'master' into next

commit 9bbedbbd950427b39215f880725e0a47b4b0a310
Merge: c4d0b47 1b8958f
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 14:55:50 2012 -0500

    Merge branch 'master' into next

commit c4d0b47fdbbbfee18d6dfc87c501731a0591fa57
Merge: f49facf 7e10a26
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 14:48:13 2012 -0500

    Merge branch 'master' into next

commit f49facf71cd1b31a8553de85377d956a3299f2d7
Merge: 89e32f4 ed7db7d
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 11:13:09 2012 -0800

    Merge branch 'master' into next

commit 89e32f4031d68b5f2a819f1923808958f931edb7
Merge: 6063ef0 1023c48
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 5 10:44:40 2012 -0800

    Merge branch 'master' into next

commit 6063ef0108a5382427519e4b99555ac7a0eee730
Merge: 3bc34ff ae4770a
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 3 14:25:03 2012 -0800

    Merge branch 'master' into next

commit 3bc34ff378d08e623b020d84c495cbc000ffab97
Merge: 0371e7b 309ca76
Author: Johnathan Corgan <address@hidden>
Date:   Thu Feb 2 13:34:40 2012 -0800

    Merge branch 'master' into next

commit 0371e7b427008f6f5fc39cc98a39a73e68362b8a
Merge: 89d8421 00518ca
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 1 17:21:36 2012 -0500

    Merge branch 'master' into next

commit 89d8421f00af503cd5805bc240f044a1d4431315
Merge: f87aef6 29aa72d
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jan 27 14:01:21 2012 -0800

    Merge branch 'master' into next

commit f87aef68a654d665ff1a773647dc1d5c9c5c9786
Merge: 242626e 8ddd8fb
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 25 16:36:11 2012 -0800

    Merge branch 'master' into next

commit 242626ea07d3c81d03a1e6e01c5995a03d0566ee
Merge: 976350d 3901b0b
Author: Tom Rondeau <address@hidden>
Date:   Sat Jan 21 10:43:54 2012 -0500

    Merge branch 'master' into next

commit 976350d892b04f5d7cc4bf939f9cbf502206a476
Merge: 2899096 d2ff8e3
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 19 22:22:49 2012 -0500

    Merge branch 'master' into next

commit 28990966c67d640c857957c471fad916f0d8a829
Merge: 893790b fe88a1d
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 18 20:01:39 2012 -0500

    Merge branch 'master' into next

commit 893790b32204842085c4ccc561348ec2a09b7d78
Merge: 2683a0c 6b74855
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 18 08:58:30 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-noaa/Makefile.am

commit 2683a0c0f240c2e42af2fae7cb91643b3f455111
Merge: 61b4f5e b6a00c8
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 17 16:28:07 2012 -0800

    Merge branch 'master' into next

commit 61b4f5e1a1141cee6c5ccb16d648f1d195f73c77
Merge: bd56b0d 4beff39
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 16 10:11:51 2012 -0500

    Merge branch 'master' into next

commit bd56b0d7d5ab684f2a22279164832756ec8e459e
Merge: 564b266 5c4da90
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 16 00:17:08 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        grc/blocks/Makefile.am

commit 564b266eb1014b09f0e658686ca3dc7b8c5dae0d
Merge: 72d1ff0 53407a4
Author: Tom Rondeau <address@hidden>
Date:   Sun Jan 15 18:37:32 2012 -0500

    Merge branch 'master' into next

commit 72d1ff01ca68f798befc3d58b61bd30c76e42c4a
Merge: cdda4a5 cc0949b
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jan 13 08:07:43 2012 -0800

    Merge branch 'master' into next

commit cdda4a586bef2ba7300c04641ac9fb550566f859
Merge: aaf6444 9ce3262
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jan 7 12:25:30 2012 -0800

    Merge branch 'master' into next
    
    * Use -s ours to skip over release commits on master

commit aaf6444f6f51319491b7bafc70c2e641a551deb6
Merge: 1b80996 9c45fe5
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jan 7 11:28:14 2012 -0800

    Merge branch 'master' into next

commit 1b80996597fc1800c28e17f77b7cb09f9783d290
Merge: d94c47d e337d7c
Author: Tom Rondeau <address@hidden>
Date:   Fri Jan 6 14:44:51 2012 -0500

    Merge branch 'master' into next

commit d94c47d652d170760ffca728dc61e45d629fcc04
Merge: 72e8cc8 ab7cfce
Author: Tom Rondeau <address@hidden>
Date:   Tue Jan 3 16:30:59 2012 -0500

    Merge branch 'master' into next

commit 72e8cc83d795ed49e1cb78e305e32dca892d0bed
Merge: 68301f5 0ab3f9f
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 2 22:49:15 2012 -0500

    Merge branch 'master' into next

commit 68301f5ef8af45bfcfe8b66cf75631f322267a7b
Merge: dd84c8d d87f671
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jan 2 11:17:29 2012 -0800

    Merge branch 'master' into next

commit dd84c8dfcb30617dbac56f49a57c1e363afe643b
Merge: 0cdc6e6 9838bb0
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 30 13:49:14 2011 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/examples/Makefile.am
        gr-digital/include/Makefile.am
        gr-digital/lib/Makefile.am
        gr-digital/python/Makefile.am
        gr-digital/swig/Makefile.am

commit 0cdc6e67f575f6c86ad12734f87cf83aed72b102
Merge: 1ea43f5 d0a7de0
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 21 10:56:51 2011 -0500

    Merge branch 'master' into next

commit 1ea43f51ad7ef8a43cfea22fa424da36011a0e9a
Merge: 25c494b f88a1e6
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 20 13:33:09 2011 -0800

    Merge branch 'master' into next

commit 25c494b347a9e0c411c8cff0101f6c7c656464f0
Merge: 1f29a38 f395bd6
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 14 22:24:44 2011 -0500

    Merge branch 'master' into next

commit 1f29a384ecd6512f5cb0891dbd651aca8ced86ed
Merge: 21a79f6 7b3e152
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 14 22:15:05 2011 -0500

    Merge branch 'master' into next

commit 21a79f683ef7c3b0c6337120d056fde452055254
Merge: 7353862 13e3ee1
Author: Johnathan Corgan <address@hidden>
Date:   Wed Dec 14 17:00:57 2011 -0800

    Merge branch 'master' into next

commit 73538627386205c25b87f7657ab6e8dd774f4cd3
Author: Martin Braun <address@hidden>
Date:   Tue Dec 13 21:08:15 2011 -0500

    core: WAV sink is now threadsafe; do_update() therefore must be private.

commit 027413aa028afb66da739918bc4ed641600e767f
Merge: d29daf9 7ad9000
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 13 14:16:32 2011 -0800

    Merge branch 'master' into next

commit d29daf9d63b2fbcf141d2a7429a76c2bb1a28729
Merge: 080f2d2 e1ad418
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 13 13:10:01 2011 -0800

    Merge branch 'master' into next

commit 080f2d212daac9297c7f3e3dbe7bd5a13b176c0d
Merge: e6a648a 0ee2298
Author: Johnathan Corgan <address@hidden>
Date:   Mon Dec 12 15:31:18 2011 -0800

    Merge branch 'master' into next

commit e6a648a80786f58b79689a4cc5697aecf38f3f08
Merge: c51087b fc6151d
Author: Johnathan Corgan <address@hidden>
Date:   Sun Dec 11 22:32:16 2011 -0800

    Merge branch 'master' into next

commit c51087bb7f005981f4b74c6a48f59a5982721951
Merge: 912cd08 fe21bc6
Author: Johnathan Corgan <address@hidden>
Date:   Sun Dec 11 13:07:11 2011 -0800

    Merge branch 'master' into next
    
    Conflicts:
        config/lf_warnings.m4
        volk/config/lf_warnings.m4

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

commit 00420d32081d8252bb37142b2be19a8a7c4dc4c4
Author: Johnathan Corgan <address@hidden>
Date:   Thu Dec 8 13:48:48 2011 -0800

    Removed autotools, gr-waveform, some cleanup
    
    Nick Foster owes Nick Corgan a six-pack of beer!

commit f52be4a8f0fa203ed206d0e0afc099856eb5bd03
Author: Johnathan Corgan <address@hidden>
Date:   Wed Dec 7 17:11:35 2011 -0800

    build: update revision to 3.6git

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


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