[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 5d78e0917e6579881cf320bffa2d0a4b773115c1

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

The branch, next has been updated
       via  5d78e0917e6579881cf320bffa2d0a4b773115c1 (commit)
       via  41107dfc64e460d2a71536a1f16d69bb68e1960d (commit)
       via  c2c8a53bee19e820859d01d8657821127c75b762 (commit)
       via  83c5a8a66d619423beec55f689640a89e2bd762b (commit)
       via  f12f7ba606d67155be4026ddf3f5ac44680556ae (commit)
       via  8927390cbfc911bdc3008bfdedde1d30706faa5b (commit)
       via  10ece2bbb3d2ba34ea18dadfb06ce6e6fd1ae6c3 (commit)
       via  35b689eb88a3534025848054d629c0bb368b66f0 (commit)
       via  b5eebec60f4802e2be0e0ef51084f4f008ef60d7 (commit)
       via  110cb25af95820fbfd1cb0ae1dc468126c704ead (commit)
       via  dada83f8893f6da01814a1a48ad54aa5652f318a (commit)
       via  f5e33003152c693a87f96cb92b7f5a98b627f3b2 (commit)
       via  f2164639dffd6d43c07206342fa775c780c77646 (commit)
       via  b4be410fbaa05025b9d827c11135cbf79dc71089 (commit)
       via  bfa8985c8e93d35b246a007b70612ca287242e3e (commit)
       via  47b79cb6ed9544df04efe3f5e84003b6d8234024 (commit)
       via  895bb2f9310ccf016779415ccd58b68176450e40 (commit)
       via  09f0820f2c275219d63c201c23deb77f8351fa35 (commit)
       via  1f0c6eed4cf60929aab39d9cfcc5f3506267b2de (commit)
       via  962d4615f4fbae3bc4a9ec09ed2f644dde8435eb (commit)
       via  17bb7b9dd517d5191f89ccf04fe906d2457b5c1b (commit)
       via  50faa5cce07af2f052e2427a23997c86c947989f (commit)
       via  345c8ae7a10af95d4f26cd53bfa8c07765d749ca (commit)
       via  bea38e035f1c0b6847acb239900d7652a786b78b (commit)
       via  c2a9dedc9ff7027c55ace3bf356bc452067e1b86 (commit)
       via  49476017b7cf69ddd6739d5cd0d50d867e2c8436 (commit)
       via  9bbedbbd950427b39215f880725e0a47b4b0a310 (commit)
       via  1b8958f5ec9b5bcde84cdd03a3e8a96b696f9485 (commit)
       via  c886c620e6fb69f8beffe791470c345dbec90232 (commit)
       via  6ba65930ba9a50b3c4618099b189fcfee5d015f0 (commit)
       via  c4d0b47fdbbbfee18d6dfc87c501731a0591fa57 (commit)
       via  7e10a26470d638afec9db3bd89ae3243fe0abd83 (commit)
       via  f49facf71cd1b31a8553de85377d956a3299f2d7 (commit)
       via  ed7db7d9326508737e9aa217d338f4f8b80a9889 (commit)
       via  3e030d338bb6d6213b3aac0ae66da3f02321e5dd (commit)
       via  d1a24646c652c81d52997f6048cd3ece29d18a3e (commit)
       via  9efac71df2d352878e86df54889973b5cf9164bf (commit)
       via  4defc0e618b04ceb71091ab3e3df62ca3e4858d8 (commit)
       via  f4dc476d9113017d36623a101b726ce1f1aa7db2 (commit)
       via  d6126a670383791dc8e24926b0d84e1c1fbefdac (commit)
       via  89e32f4031d68b5f2a819f1923808958f931edb7 (commit)
       via  1023c48cc7e05a0d6c9ae72587304a86c57d6ca8 (commit)
       via  e6805a25568a5ce24937039f57a6eb1df1f82aa9 (commit)
       via  651301f7c0dc3ea58d2b770baeb8de0f42ceb609 (commit)
       via  6063ef0108a5382427519e4b99555ac7a0eee730 (commit)
       via  ae4770a0781d5ecab3b5ccce2fe037c0c52407c5 (commit)
       via  2b87c2a7c11c4ee20b8f1356f39537043234c1b4 (commit)
       via  3bc34ff378d08e623b020d84c495cbc000ffab97 (commit)
       via  309ca769afb74a091a5c923e1bb5fb71f535dee6 (commit)
       via  63ffe1ade4b582fc76a09139231dbf942c6ec85a (commit)
       via  89af584a24f470027874e30a2e238de3bb5f0d1f (commit)
       via  0371e7b427008f6f5fc39cc98a39a73e68362b8a (commit)
       via  7403f9f0611e44e91cc33d6aace182e041af2152 (commit)
       via  00518cacb2620a18f3d473b8b7adcc21547034e6 (commit)
       via  ba6fee9bc18efd2f84547f653de986bdf485472c (commit)
       via  9adfc42e0296d969a498249d837e29bf46bf65a9 (commit)
       via  8349e172965f67c08937c3c93f3772c55c892935 (commit)
       via  23f191c0a6cedece938d7daedaf7582694eab47d (commit)
       via  89d8421f00af503cd5805bc240f044a1d4431315 (commit)
       via  29aa72d4499361e661886dbfe7833bcc2c6f3746 (commit)
       via  40e186f953abafe4fde19cf2cf34d61d801c31e2 (commit)
       via  b207aa2d76a8171681b0ff0a3b5342e8f0703ba9 (commit)
       via  f87aef68a654d665ff1a773647dc1d5c9c5c9786 (commit)
       via  8ddd8fbb0d780072081215db432aaf59d4a46dda (commit)
       via  f122d72a1090d38d1a08f98c56e0d071f79fef0b (commit)
       via  242626ea07d3c81d03a1e6e01c5995a03d0566ee (commit)
       via  3901b0b7025a66ae04748e65b2bdd59e59e574df (commit)
       via  2d80e59c2b26de65e5266b8c6fb4be118a7428a0 (commit)
       via  976350d892b04f5d7cc4bf939f9cbf502206a476 (commit)
       via  d2ff8e3438c83876bdcc587a76b40c7a4281d3c6 (commit)
       via  6e3ec5d3697274f45bb83e68818402e50c1e23a6 (commit)
       via  748063b203b137fe30d0f2d26614859f4cbc45ea (commit)
       via  8720afbfbe40c6e88345c2ddbeabe5d2ae4ff62e (commit)
       via  26de2814ed10cb3a03d0209e8cbaf22540f2650e (commit)
       via  28990966c67d640c857957c471fad916f0d8a829 (commit)
       via  fe88a1ddf623df701e5f3a0c4c8e4fd008570b83 (commit)
       via  da8f67595847f63358792f24ad88582f4c16efed (commit)
       via  893790b32204842085c4ccc561348ec2a09b7d78 (commit)
       via  6b7485547542647d8a1e0dbd7dd77f4563ac868d (commit)
       via  877e92eb06f2603930a049ffc75e234b711fafa4 (commit)
       via  2683a0c0f240c2e42af2fae7cb91643b3f455111 (commit)
       via  b6a00c8ba86d5356d574d0c4166ed9c0255a9a90 (commit)
       via  9f41efcb0a98f035186d84deffa21f1c38141845 (commit)
       via  7850d5f25168db322d76da9bc6cf3730c5d88d3e (commit)
       via  8736ac20a1a7def9a024aa9c934b7b95ffdef373 (commit)
       via  f58076ffbba790fd93504ea1d38e39e278e663de (commit)
       via  0aa47db21afc09b37ac4e0feebeaa624e5549714 (commit)
       via  0f3bb8be9d3eb2549de15c7192fcbeb57baf588d (commit)
       via  e3068517815363102043363556be654c5b47c5c9 (commit)
       via  a6517c9fa394ccf48206979f1e02608055de6a0c (commit)
      from  3685f358f99c4f5fc5b6d88971f3660d84be7fdc (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 5d78e0917e6579881cf320bffa2d0a4b773115c1
Merge: 3685f35 41107df
Author: Josh Blum <address@hidden>
Date:   Thu Feb 9 10:37:57 2012 -0800

    Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
    
    Conflicts:
        gr-uhd/include/gr_uhd_amsg_source.h

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 c2c8a53bee19e820859d01d8657821127c75b762
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 8 19:48:02 2012 -0500

    cmake: fix for handling fftw_threads as an optional library only.

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 f12f7ba606d67155be4026ddf3f5ac44680556ae
Merge: 35b689e 8927390
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 7 13:18:26 2012 -0500

    Merge branch 'maint'

commit 8927390cbfc911bdc3008bfdedde1d30706faa5b
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 7 13:17:47 2012 -0500

    docs: better handling of html only for formulas.

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 35b689eb88a3534025848054d629c0bb368b66f0
Author: Marcus Leech <address@hidden>
Date:   Mon Feb 6 22:23:06 2012 -0500

    gui: better handling of buffers in oscope for stripchart/non-stripchart.

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 110cb25af95820fbfd1cb0ae1dc468126c704ead
Merge: b4be410 dada83f
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 17:07:11 2012 -0800

    Merge branch 'maint'

commit dada83f8893f6da01814a1a48ad54aa5652f318a
Merge: bfa8985 f5e3300
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 17:04:54 2012 -0800

    Merge remote branch 'ncorgan/package-version-fix' into maint

commit f5e33003152c693a87f96cb92b7f5a98b627f3b2
Author: Nicholas Corgan <address@hidden>
Date:   Mon Feb 6 15:24:37 2012 -0800

    CMake package uses "X.X.X" version number instead of "vX.X.X"

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 b4be410fbaa05025b9d827c11135cbf79dc71089
Merge: 895bb2f bfa8985
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 14:58:46 2012 -0800

    Merge branch 'maint'

commit bfa8985c8e93d35b246a007b70612ca287242e3e
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 14:54:37 2012 -0800

    Revert "dpkg rejects "vX.X.X" version number because it doesn't start with 
a number, CMake assigns "X.X.X" version number to generated executables"
    
    This reverts commit c2a9dedc9ff7027c55ace3bf356bc452067e1b86.

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 895bb2f9310ccf016779415ccd58b68176450e40
Merge: 09f0820 962d461
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 17:33:31 2012 -0500

    Merge branch 'maint'

commit 09f0820f2c275219d63c201c23deb77f8351fa35
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 17:32:23 2012 -0500

    grc: add nthread parameter to FFT-based blocks.

commit 1f0c6eed4cf60929aab39d9cfcc5f3506267b2de
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 17:31:52 2012 -0500

    core: updated missed vfc version of fft block to use nthreads.
    
    Also updates copyright dates.

commit 962d4615f4fbae3bc4a9ec09ed2f644dde8435eb
Merge: bea38e0 345c8ae
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 16:55:08 2012 -0500

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

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 50faa5cce07af2f052e2427a23997c86c947989f
Merge: 1b8958f 345c8ae
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 13:45:30 2012 -0800

    Merge branch 'maint'

commit 345c8ae7a10af95d4f26cd53bfa8c07765d749ca
Merge: 6ba6593 c2a9ded
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 13:44:16 2012 -0800

    Merge remote branch 'ncorgan/package-version-fix' into maint

commit bea38e035f1c0b6847acb239900d7652a786b78b
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 16:14:37 2012 -0500

    docs: fixed some markup of formulas between html and xml (and therefore the 
swigdocs).

commit c2a9dedc9ff7027c55ace3bf356bc452067e1b86
Author: Nicholas Corgan <address@hidden>
Date:   Mon Feb 6 13:12:42 2012 -0800

    dpkg rejects "vX.X.X" version number because it doesn't start with a 
number, CMake assigns "X.X.X" version number to generated executables

commit 49476017b7cf69ddd6739d5cd0d50d867e2c8436
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 15:32:43 2012 -0500

    core: fix a warning.

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 1b8958f5ec9b5bcde84cdd03a3e8a96b696f9485
Merge: c886c62 6ba6593
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 14:55:35 2012 -0500

    Merge branch 'maint'

commit c886c620e6fb69f8beffe791470c345dbec90232
Merge: 7e10a26 ed7db7d
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 14:49:26 2012 -0500

    Merge branch 'master' of gnuradio.org:gnuradio

commit 6ba65930ba9a50b3c4618099b189fcfee5d015f0
Merge: d6126a6 3e030d3
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 14:48:32 2012 -0500

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

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 7e10a26470d638afec9db3bd89ae3243fe0abd83
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 14:08:00 2012 -0500

    core: expose nthreads setting through to fft_filters.
    
    Can set nthreads as last arg to filter; defaults to 1 so no change in 
default behavior.

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 ed7db7d9326508737e9aa217d338f4f8b80a9889
Merge: 1023c48 3e030d3
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 11:12:38 2012 -0800

    Merge branch 'maint'

commit 3e030d338bb6d6213b3aac0ae66da3f02321e5dd
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 6 11:11:04 2012 -0800

    howto: fix cmake swig header installation

commit d1a24646c652c81d52997f6048cd3ece29d18a3e
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 12:02:35 2012 -0500

    core: expose nthreads capabilities to gr_fft_vcc.
    
    Can set and get nthreads; defaults to 1, so no change in default behavior.

commit 9efac71df2d352878e86df54889973b5cf9164bf
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 12:01:57 2012 -0500

    core: add functions to set/get nthreads of gri FFT object.

commit 4defc0e618b04ceb71091ab3e3df62ca3e4858d8
Author: Marcus Leech <address@hidden>
Date:   Mon Feb 6 11:11:06 2012 -0500

    core: enable use of fftw's threading capabilities.
    
    Can set nthreads when creating an fftw class; defaults to 1, so there's no 
change in default behavior.

commit f4dc476d9113017d36623a101b726ce1f1aa7db2
Merge: 1023c48 d6126a6
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 6 11:05:14 2012 -0500

    Merge branch 'maint'

commit d6126a670383791dc8e24926b0d84e1c1fbefdac
Author: Marcus Leech <address@hidden>
Date:   Mon Feb 6 10:45:07 2012 -0500

    io: fix triggering and performance issues with oscope; specifically for the 
strip-chart features.

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 1023c48cc7e05a0d6c9ae72587304a86c57d6ca8
Merge: ae4770a e6805a2
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 5 10:43:09 2012 -0800

    Merge branch 'maint'

commit e6805a25568a5ce24937039f57a6eb1df1f82aa9
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 5 10:37:02 2012 -0800

    cmake: remove QUIET option from some listfiles
    
    * PKG_CHECK_MODULES only supports QUIET >=2.8.2, Ubuntu LTS has 2.8.0

commit 651301f7c0dc3ea58d2b770baeb8de0f42ceb609
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 5 10:27:47 2012 -0800

    howto: various fixes cmake, cleanup
    
    * Fixed include dir variable, now works when gnuradio-core in custom prefix
    
    * Removed QUIET option, only works for cmake >=2.8.2, Ubuntu LTS has 2.8.0
    
    * Fixed library name for gruel search

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 ae4770a0781d5ecab3b5ccce2fe037c0c52407c5
Merge: 309ca76 2b87c2a
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 3 14:24:49 2012 -0800

    Merge branch 'maint'

commit 2b87c2a7c11c4ee20b8f1356f39537043234c1b4
Author: Nicholas Corgan <address@hidden>
Date:   Fri Feb 3 12:10:23 2012 -0800

    Fixed mislabeled dependencies for Fedora 15

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 309ca769afb74a091a5c923e1bb5fb71f535dee6
Merge: 00518ca 63ffe1a
Author: Johnathan Corgan <address@hidden>
Date:   Thu Feb 2 13:34:32 2012 -0800

    Merge branch 'maint'

commit 63ffe1ade4b582fc76a09139231dbf942c6ec85a
Author: Josh Blum <address@hidden>
Date:   Thu Feb 2 13:30:34 2012 -0800

    grc: better error for import gr fail

commit 89af584a24f470027874e30a2e238de3bb5f0d1f
Author: Josh Blum <address@hidden>
Date:   Thu Feb 2 13:25:50 2012 -0800

    grc: fix install permissions on grc_setup_freedesktop

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 7403f9f0611e44e91cc33d6aace182e041af2152
Merge: 9adfc42 f122d72
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 1 17:20:53 2012 -0500

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

commit 00518cacb2620a18f3d473b8b7adcc21547034e6
Merge: ba6fee9 29aa72d
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 1 17:20:29 2012 -0500

    Merge branch 'master' of gnuradio.org:gnuradio

commit ba6fee9bc18efd2f84547f653de986bdf485472c
Merge: 8349e17 9adfc42
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 1 17:19:58 2012 -0500

    Merge branch 'maint'

commit 9adfc42e0296d969a498249d837e29bf46bf65a9
Author: Marcus Leech <address@hidden>
Date:   Wed Feb 1 17:15:59 2012 -0500

    uhd: fix for uhd_fft to work with basicRx d'board.

commit 8349e172965f67c08937c3c93f3772c55c892935
Merge: 3901b0b 23f191c
Author: Tom Rondeau <address@hidden>
Date:   Wed Feb 1 17:18:19 2012 -0500

    Merge branch 'uhd_fft_rxbasic'

commit 23f191c0a6cedece938d7daedaf7582694eab47d
Author: Marcus Leech <address@hidden>
Date:   Wed Feb 1 17:15:59 2012 -0500

    uhd: fix for uhd_fft to work with basicRx d'board.

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 29aa72d4499361e661886dbfe7833bcc2c6f3746
Merge: 8ddd8fb 40e186f
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jan 27 14:00:52 2012 -0800

    Merge branch 'gr-uhd-async-msg-recv'

commit 40e186f953abafe4fde19cf2cf34d61d801c31e2
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jan 26 15:01:09 2012 -0800

    uhd: add async message print option to apps

commit b207aa2d76a8171681b0ff0a3b5342e8f0703ba9
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jan 26 14:06:37 2012 -0800

    uhd: add utility function to convert raw gr_message to async_metadata_t

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 8ddd8fbb0d780072081215db432aaf59d4a46dda
Merge: 3901b0b f122d72
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 25 16:35:59 2012 -0800

    Merge branch 'maint'

commit f122d72a1090d38d1a08f98c56e0d071f79fef0b
Author: Josh Blum <address@hidden>
Date:   Wed Jan 25 12:05:35 2012 -0800

    core: fix floor ambiguous overload in vcc fftw
    
    The msvc compiler doesnt like the ambiguous overload of floor.
    However, floor should not have an effect on the integer divide anyway.

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 3901b0b7025a66ae04748e65b2bdd59e59e574df
Merge: d2ff8e3 2d80e59
Author: Tom Rondeau <address@hidden>
Date:   Sat Jan 21 10:42:15 2012 -0500

    Merge branch 'maint'

commit 2d80e59c2b26de65e5266b8c6fb4be118a7428a0
Author: Tom Rondeau <address@hidden>
Date:   Sat Jan 21 10:41:23 2012 -0500

    noaa: add pc file for gr-noaa to m4 file.

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 d2ff8e3438c83876bdcc587a76b40c7a4281d3c6
Merge: 748063b 6e3ec5d
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 19 22:18:48 2012 -0500

    Merge branch 'maint'

commit 6e3ec5d3697274f45bb83e68818402e50c1e23a6
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 19 22:14:31 2012 -0500

    docs: another try/except/rerun spot.

commit 748063b203b137fe30d0f2d26614859f4cbc45ea
Merge: fe88a1d 8720afb
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 19 21:55:27 2012 -0500

    Merge branch 'maint'

commit 8720afbfbe40c6e88345c2ddbeabe5d2ae4ff62e
Merge: 26de281 f58076f
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 19 21:49:43 2012 -0500

    Merge branch 'nosync' into maint

commit 26de2814ed10cb3a03d0209e8cbaf22540f2650e
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 19 21:31:14 2012 -0500

    core: fixed bug in FFT shift operation.

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 fe88a1ddf623df701e5f3a0c4c8e4fd008570b83
Merge: 6b74855 da8f675
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 18 20:01:22 2012 -0500

    Merge branch 'maint'

commit da8f67595847f63358792f24ad88582f4c16efed
Author: Nick Foster <address@hidden>
Date:   Wed Jan 18 20:01:05 2012 -0500

    volk: fix for newer orc.

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 6b7485547542647d8a1e0dbd7dd77f4563ac868d
Merge: b6a00c8 877e92e
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 18 08:57:42 2012 -0800

    Merge branch 'maint'

commit 877e92eb06f2603930a049ffc75e234b711fafa4
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 18 08:57:29 2012 -0800

    noaa: add pkgconfig file for C++ library

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 b6a00c8ba86d5356d574d0c4166ed9c0255a9a90
Merge: 4beff39 9f41efc
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 17 16:25:54 2012 -0800

    Merge branch 'maint'

commit 9f41efcb0a98f035186d84deffa21f1c38141845
Author: Josh Blum <address@hidden>
Date:   Tue Jan 17 15:51:05 2012 -0800

    qtgui: better findqwt.cmake with standard paths

commit 7850d5f25168db322d76da9bc6cf3730c5d88d3e
Author: Josh Blum <address@hidden>
Date:   Tue Jan 17 15:48:02 2012 -0800

    gruel: hrt under bsd should use clock gettime

commit 8736ac20a1a7def9a024aa9c934b7b95ffdef373
Author: Josh Blum <address@hidden>
Date:   Tue Jan 17 15:42:25 2012 -0800

    cmake: fix for cmake 2.6 with library extras mode
    
    OUTPUT_NAME is a target output name that should work with both 2.6 and 2.8
    
    LIBRARY_OUTPUT_NAME is new to 2.8 and more specific

commit f58076ffbba790fd93504ea1d38e39e278e663de
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 16 09:30:12 2012 -0500

    docs: another hack to check for errors and retry when building the swigdocs.

commit 0aa47db21afc09b37ac4e0feebeaa624e5549714
Author: Tom Rondeau <address@hidden>
Date:   Fri Jan 6 15:07:35 2012 -0500

    docs: another recheck point in the siwg_doc code. If a parse error happens, 
try rereading up to 3 times.

commit 0f3bb8be9d3eb2549de15c7192fcbeb57baf588d
Author: Tom Rondeau <address@hidden>
Date:   Tue Jan 3 17:15:23 2012 -0500

    build: have swig_doc catch the exception when the xml parsing fails on a 
not-complete file.
    
    The method sleeps for a second and tries again 3 times before fully 
failing. This seems a bit crass...

commit e3068517815363102043363556be654c5b47c5c9
Author: Tom Rondeau <address@hidden>
Date:   Tue Jan 3 17:09:42 2012 -0500

    build: not going to work. Removing changes to cmake files and no sync call.

commit a6517c9fa394ccf48206979f1e02608055de6a0c
Author: Tom Rondeau <address@hidden>
Date:   Tue Jan 3 14:32:05 2012 -0500

    build: maybe towards a better way of getting Doxygen docstrings to build 
with -jN.

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

Summary of changes:
 cmake/Modules/FindCppUnit.cmake                    |    2 +-
 cmake/Modules/FindFFTW3f.cmake                     |   16 +++-
 cmake/Modules/FindQwt.cmake                        |   17 +++-
 cmake/Modules/FindUHD.cmake                        |    2 +-
 cmake/Modules/GrMiscUtils.cmake                    |    2 +-
 cmake/Modules/GrPackage.cmake                      |    2 +-
 cmake/Modules/GrSwig.cmake                         |   13 +---
 cmake/Packaging/Fedora-15.cmake                    |    4 +-
 docs/doxygen/swig_doc.py                           |   76 +++++++++++++++---
 gnuradio-core/src/lib/CMakeLists.txt               |    5 +
 gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc  |   29 ++++++-
 gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h   |   22 +++++-
 gnuradio-core/src/lib/filter/gr_fft_filter_ccc.i   |   10 ++-
 gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc  |   28 ++++++-
 gnuradio-core/src/lib/filter/gr_fft_filter_fff.h   |   24 +++++-
 gnuradio-core/src/lib/filter/gr_fft_filter_fff.i   |    9 ++-
 gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h   |   20 ++++-
 .../src/lib/filter/gr_single_pole_iir_filter_cc.h  |   20 ++++-
 .../src/lib/filter/gr_single_pole_iir_filter_ff.h  |   20 ++++-
 .../src/lib/filter/gri_fft_filter_ccc_generic.cc   |   25 +++++-
 .../src/lib/filter/gri_fft_filter_ccc_generic.h    |   15 +++-
 .../src/lib/filter/gri_fft_filter_fff_generic.cc   |   21 +++++-
 .../src/lib/filter/gri_fft_filter_fff_generic.h    |   15 +++-
 gnuradio-core/src/lib/general/gr_fft_vcc.cc        |   22 +++++-
 gnuradio-core/src/lib/general/gr_fft_vcc.h         |   13 +++-
 gnuradio-core/src/lib/general/gr_fft_vcc.i         |   12 ++-
 gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc   |   38 +++++++--
 gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h    |   15 +++-
 gnuradio-core/src/lib/general/gr_fft_vfc.cc        |   27 +++++-
 gnuradio-core/src/lib/general/gr_fft_vfc.h         |   17 +++-
 gnuradio-core/src/lib/general/gr_fft_vfc.i         |   12 ++-
 gnuradio-core/src/lib/general/gri_fft.cc           |   70 +++++++++++++++-
 gnuradio-core/src/lib/general/gri_fft.h            |   39 ++++++++-
 gnuradio-core/src/lib/io/gr_oscope_guts.cc         |   65 +++++++++++----
 gnuradio-core/src/python/gnuradio/gr/qa_fft.py     |   54 ++++++++++++
 .../src/python/gnuradio/gr/qa_fft_filter.py        |   86 +++++++++++++++++++-
 .../cmake/Modules/FindGnuradioCore.cmake           |    4 +-
 .../cmake/Modules/FindGruel.cmake                  |    4 +-
 gr-howto-write-a-block/swig/CMakeLists.txt         |    2 +-
 gr-noaa/CMakeLists.txt                             |   14 +++
 .../gnuradio-noaa.pc.in                            |    6 +-
 gr-shd/CMakeLists.txt                              |    2 +-
 gr-uhd/apps/uhd_fft.py                             |   41 +++++++---
 gr-uhd/apps/uhd_rx_cfile.py                        |   17 ++++-
 gr-uhd/apps/uhd_rx_nogui.py                        |   15 +++-
 gr-uhd/apps/uhd_siggen.py                          |   16 +++-
 grc/blocks/gr_fft_filter_xxx.xml                   |    9 ++-
 grc/blocks/gr_fft_vxx.xml                          |   11 ++-
 grc/freedesktop/CMakeLists.txt                     |    4 +-
 grc/scripts/gnuradio-companion                     |   13 +++-
 gruel/src/include/gruel/high_res_timer.h           |    2 +-
 volk/orc/volk_8i_convert_16i_a_orc_impl.orc        |    5 +-
 52 files changed, 864 insertions(+), 168 deletions(-)
 copy gr-atsc/gnuradio-atsc.pc.in => gr-noaa/gnuradio-noaa.pc.in (54%)


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