commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] git://gnuradio.org/michaelld branch, fix_build_dir_ord


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/michaelld branch, fix_build_dir_order_next, created. a5dcd13eee561f74715ea537ec93dabfcc24039b
Date: Mon, 7 Jan 2013 14:02:50 +0000 (UTC)

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/michaelld".

The branch, fix_build_dir_order_next has been created
        at  a5dcd13eee561f74715ea537ec93dabfcc24039b (commit)

- Log -----------------------------------------------------------------
commit a5dcd13eee561f74715ea537ec93dabfcc24039b
Merge: 1d72dba 77884c6
Author: Michael L Dickens <address@hidden>
Date:   Mon Jan 7 09:01:09 2013 -0500

    merge of fix_build_dir_order, fix conflict

commit 1d72dbaf448cb4a398223835b69b71ae3d2a6c22
Merge: c03114f 6ac84d9
Author: Michael L Dickens <address@hidden>
Date:   Mon Jan 7 08:42:36 2013 -0500

    Merge branch 'next' into fix_build_dir_order_next

commit c03114f9861920b246c36bb7e6b2098dadacd60e
Merge: 68e9946 baaf2b6
Author: Michael L Dickens <address@hidden>
Date:   Fri Jan 4 21:32:13 2013 -0500

    Merge master/fix_build_dir_order into next, then fix conflicts and redo 
come of the INCLUDE_DIRS order

commit 6ac84d93d4e41a68f9e2885ffc403ed2e0e11a27
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 3 19:35:35 2013 -0500

    qtgui: fixing up rest of name changes in UI file (examples were tested this 
time).

commit 3bf0ca10d647f0590660679cb5b104041ea3ee13
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 3 18:27:13 2013 -0500

    qtgui: missed these updated slot names.

commit 6aca2a857cf458de79021c7eaa31bb08bee906b0
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 3 18:11:42 2013 -0500

    qtgui: function names updated so they are (or should be) consistent.

commit 4ff4d954b2ec517ae78d7fe60765b65b1e302153
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 3 16:52:28 2013 -0500

    qtgui: fixed waterfall plots to handle center frequency changes.
    
    Also updated function names to be more consistent.

commit c4ee4056f44dbb917bb6cd042471e92e04960a61
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 3 16:31:49 2013 -0500

    squash me

commit 13d09a531d2172e2b9adaa204fcc6b4aae694e1f
Author: Tom Rondeau <address@hidden>
Date:   Thu Jan 3 16:30:58 2013 -0500

    qtgui: fix for frequency plot to handle change in center frequency.

commit 68e99469dddd3b0347f59d0e3f50c60379390351
Merge: 04a6a4f 16b0f3f
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 18:14:16 2013 -0500

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

commit 04a6a4f0a098d43c39048fc73b2819c50764ba02
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 18:13:57 2013 -0500

    ctrlport: removing unused and unecessary file.

commit 16b0f3ffc278dc0f0f33e333d4d12d297e041911
Merge: 940d30c f90ebba
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 17:17:40 2013 -0500

    Merge branch 'master' into next

commit 940d30c570d8725c53845e4f2df06834a869b5c5
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 17:14:26 2013 -0500

    pmt: fixed where pmt's __init__.py script gets installed.

commit 525b6a1bfe867a8b4411c5d0705a9eba56849712
Merge: 20af017 09a9e19
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 13:32:45 2013 -0500

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

commit 20af01746e43414c9ebaef5c387479de4a3ed621
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 13:32:17 2013 -0500

    pmt: too hasty in fixing a conflict in the merge.

commit 09a9e19eb5970f0eeb8ad247054d22493367f30a
Merge: 69f5736 f4500cc
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 2 10:08:28 2013 -0800

    Merge branch 'master' into next

commit 1114f81d59abd87cbb0c10d88ab243935ba9e35f
Merge: 69f5736 aa4245a
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 13:01:53 2013 -0500

    Merge branch 'pmt_rename' into next
    
    Conflicts:
        gnuradio-core/src/lib/io/gr_pdu.cc
        gruel/src/lib/pmt/pmt.cc
        gruel/src/lib/pmt/qa_pmt_prims.cc
        gruel/src/lib/pmt/unv_template.cc.t
        gruel/src/swig/pmt_swig.i

commit aa4245a69bf6954bf45c51aa7ffec9d049e09edc
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 2 12:58:42 2013 -0500

    pmt: updated pmt docs for new naming scheme.

commit 69f57364c5b8fc575b6a956468025da37d32b1a6
Merge: d2ffdf9 79284e9
Author: Johnathan Corgan <address@hidden>
Date:   Mon Dec 31 12:55:04 2012 -0800

    Merge branch 'master' into next

commit d2ffdf9044987d53445dd50387ec747b4437ffc3
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 31 13:27:50 2012 -0500

    wxgui: using logpwrfft properly from gr-fft.

commit 830dd449c2bd69efa728fc01bb2e5cbec4c45173
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 31 13:12:46 2012 -0500

    analog: fixing up UHD apps to use gr-analog module.

commit a4b8e393b65198e2d81a8608635c33470973f6e2
Merge: 9f50779 908a3e2
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 31 12:52:11 2012 -0500

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

commit 908a3e252a3e3cc6a96198760de60a5b77a00254
Merge: 733a308 8c7d654
Author: Tom Rondeau <address@hidden>
Date:   Sun Dec 30 14:47:19 2012 -0500

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

commit 733a308af0e7ed8048f0dbc0ab17295984b14a55
Author: Tom Rondeau <address@hidden>
Date:   Sun Dec 30 14:34:27 2012 -0500

    core: removed test to import blks2 since we've removed all of 
blks2/blks2impl.

commit 4cb89d3f5154a76ecdf8c2e5aed9210d6301c5c1
Author: Tom Rondeau <address@hidden>
Date:   Sun Dec 30 12:55:19 2012 -0500

    video-sdl: converted to new structure.

commit 9f507798e294cdf80049b35c8b167313ed5ad88e
Merge: fa06337 8c7d654
Author: Tom Rondeau <address@hidden>
Date:   Sun Dec 30 12:13:34 2012 -0500

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

commit afc76414c6a8e76a8ba9fe336a25864eb2b008df
Author: Tom Rondeau <address@hidden>
Date:   Sat Dec 29 20:31:48 2012 -0500

    utils: minor change to convert gr-utils to new stucture.

commit 0fb538e11e8425c4f15063e249dc0dae2d54ebd5
Merge: 4580aaf c805168
Author: Tom Rondeau <address@hidden>
Date:   Sat Dec 29 20:26:35 2012 -0500

    Merge branch 'next_blocks' into next
    
    Conflicts:
        gr-trellis/CMakeLists.txt
        gr-trellis/python/CMakeLists.txt

commit 4580aaf9583b1e8ca4b3ef1d3127c7d48566fe67
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 28 09:40:01 2012 -0500

    trellis: converted gr-trellis to new style.

commit 8c7d654ad0bb49684e0badb64fc84d72053d4ac9
Merge: 6a8fc32 80d1e9d
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 29 11:48:45 2012 -0800

    Merge branch 'master' into next

commit c805168975a30af962fbd0a25c091d7b2113394e
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 27 13:50:09 2012 -0500

    grc: updating GRC exmaples for new component changes.

commit cb18c1c206145707b9d5c62cada32ff43f99ca3f
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 27 12:51:20 2012 -0500

    filter: moved window around so it's available in both gr-fft and gr-filter.

commit 6a8fc327dc2cbd1fa63b9acd08fa90baea0758e8
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 27 10:09:02 2012 -0500

    filter: handle a log10(0) warning that causes QT to crash when designing 
filters.

commit 3332574d8e9e3432e46efb6765daf5c68fa12001
Merge: 57d9b46 89f7782
Author: Johnathan Corgan <address@hidden>
Date:   Sun Dec 23 10:37:05 2012 -0800

    Merge branch 'master' into next
    
    Used merge strategy -s ours to skip release commit.

commit fa06337ac128609532f904f74c6bdc75fee0e053
Merge: 55d3e4a 57d9b46
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 21 21:25:11 2012 -0500

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

commit ff1629ad99f5bbce76c993f0629275d0eba171d6
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 21 21:21:40 2012 -0500

    gruel: using new pmt naming.

commit 55d3e4a47958be287648a2021f7e92d81086b2d9
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 21 15:11:39 2012 -0500

    blocks: removes blocks moved to gr-blocks from gnuradio-core.
    
    Also fixes up some other missing moves.

commit fa781237f341a74a243a9fb930daee7e62c3a682
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 20 11:54:22 2012 -0500

    gruel: adding a 'pmt_from_complex' call (more clear than 
pmt_make_rectangular).

commit b5512ab8d904079fe29731621b10c71368f1a322
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 19 18:03:49 2012 -0500

    gruel: pmt_Xvector_elements can be used in Python to return a Python tuple.

commit 98da6e17aab67835fcd22c282ee70ad8ba050fcd
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 21 11:36:31 2012 -0500

    gruel: updating all GR blocks that use PMTs to use new naming.

commit 275add3ae70d648dfb0ce14eb7df99b0e9adecbd
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 20 22:56:56 2012 -0500

    gruel: Renaming PMT function to get rid of pmt_ prefix.
    
    Also cleans up Python interface. Removed pmt.print statement from swig but 
overloaded __repr__ attribute of PMTs for easy printing.

commit f0bff01c27c793952f41344c62b4ea6a7cb5bdf1
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 20 11:54:22 2012 -0500

    gruel: adding a 'pmt_from_complex' call (more clear than 
pmt_make_rectangular).

commit 0973e4fc841b80988f18f25aa504a01f79d801c5
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 19 18:03:49 2012 -0500

    gruel: pmt_Xvector_elements can be used in Python to return a Python tuple.

commit 57d9b46d085b6ab208b883e15fed415abb76fea3
Merge: 1de1598 4d391cc
Author: Johnathan Corgan <address@hidden>
Date:   Thu Dec 20 19:55:02 2012 -0800

    Merge branch 'master' into next

commit 1de1598bb28ea32db4517f721003795aa1367e07
Merge: 33891e5 6fd15fc
Author: Johnathan Corgan <address@hidden>
Date:   Thu Dec 20 19:32:52 2012 -0800

    Merge branch 'master' into next

commit 33891e526313788ad61e5ca92737dd9baaa7fab4
Merge: c417ede b60396a
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 20 16:57:48 2012 -0500

    Merge branch 'master' into next

commit c417edef7424691d32d835c778174ac3f1db7ad8
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 20 16:46:46 2012 -0500

    qtgui: added check_topology to check d_nconnections and actual connections.

commit e98b2874a7051f0341a229f357f1efe9f87caffa
Author: Sreeraj Rajendran <address@hidden>
Date:   Thu Dec 20 00:53:33 2012 +0530

    init call parameter bugfix

commit 5b213ec93cbab6e0d20d162e4a2b2b8fd0ba23f5
Author: Sreeraj Rajendran <address@hidden>
Date:   Thu Dec 20 00:28:22 2012 +0530

    FIR filter coefficients tab update for easy copying

commit 6eb10863f8ca38a8e4b0b7192eb405e0f5cec80d
Author: Sreeraj Rajendran <address@hidden>
Date:   Thu Dec 20 00:15:38 2012 +0530

    Launch function change to suppor runtime updation

commit 8cbe34b66a4f005cebe01ba376ae7f8d8b4a4017
Merge: 34c9ee5 d2194d1
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 18 17:05:40 2012 -0500

    Merge branch 'gr_filtdes' into next

commit d2194d17ef3da8db7e8f45ad053cadf1664c2970
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 18 17:04:55 2012 -0500

    filter: Install all filter design tool files into gnuradio.filter.
    
    Also updated copyright on filtdes stuff.

commit 34c9ee546b0fba7b3938170bf228e5f6c2991fdb
Merge: e39fae9 620dd7e
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 18 15:36:17 2012 -0500

    Merge branch 'master' into next

commit e39fae92a396aa984cba96a8bfd5cfe562ed7008
Merge: af16ab5 b15b38d
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 17 16:10:13 2012 -0500

    Merge branch 'master' into next

commit af16ab52459dd136cb04caf0ced5deefebc7a71d
Merge: 0ddcb66 c866b5e
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 17 11:03:32 2012 -0500

    Merge branch 'master' into next

commit cf0276ca5fdebb12a71bcaac4fb629a7e67db813
Author: Sreeraj Rajendran <address@hidden>
Date:   Mon Dec 17 15:30:40 2012 +0530

    Some typos fix

commit 0ddcb66881a7cd6e31be0e470097a79da1257be1
Merge: 937865a 6f7a912
Author: Tom Rondeau <address@hidden>
Date:   Sat Dec 15 11:09:33 2012 -0500

    Merge branch 'master' into next

commit bb817474fd3caf3d27bd5d20094ab389fbebea4a
Author: Sreeraj Rajendran <address@hidden>
Date:   Sat Dec 15 21:21:12 2012 +0530

    gr_filtdes initial commit

commit 937865a8d1059b4d6202c6a59a1d8ded950f63d3
Merge: c352ce2 461ece5
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 14 18:01:15 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-utils/src/python/CMakeLists.txt

commit c352ce2edfbf7cb1d11d7af491e71825b1b858c5
Merge: 521a39a aeb7bbf
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 12 16:20:59 2012 -0500

    Merge branch 'master' into next

commit 521a39ade2350f7a0078c5af34df716d15befbc3
Merge: c3fc76c 6e1b288
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 12 16:09:45 2012 -0500

    Merge branch 'master' into next

commit c3fc76c6cbc69fbf9505611b03c579f8032ea6e7
Author: Tim O'Shea <address@hidden>
Date:   Wed Dec 12 15:37:47 2012 -0500

    ctrlport: adding a curses-based monitor agent for ControlPort.

commit 4194f8871746765f97e6e6fbc3188a37a36fed5f
Merge: 761ae45 74817ae
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 12 14:17:23 2012 -0500

    Merge branch 'master' into next

commit 761ae45b870bf1a9e74d8f04795716a9dfeeaa7f
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 12 11:23:54 2012 -0500

    build: Removing GR_SWIG_TARGET_DEPS from new components gr-fec and 
gr-channels.

commit 915fa3c0ab1bc863fa965c1edc773b528827aa96
Merge: 53554ae 60c60b0
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 12 11:23:22 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/swig/CMakeLists.txt

commit 53554ae38281bdd6524d8a75e6d91f286900e670
Merge: 2011e07 95968f9
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 11 22:58:31 2012 -0500

    Merge branch 'master' into next

commit 2011e07a5b45254be65c6cd4104fa04b65f64e03
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 11 22:48:03 2012 -0500

    blocks: apply changes to file source in core to one in gr-blocks.

commit 95111ed54bebee4726b8c444632cd1bc5f65c28d
Merge: daa2d62 ee53cca
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 11 21:53:56 2012 -0500

    Merge branch 'master' into next

commit daa2d62d72857c29cd71650b89aa16585f86fb6d
Merge: 0154c13 9dc29eb
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 11 19:33:10 2012 -0500

    Merge branch 'master' into next

commit 0154c13c5e7a97a9ae1e93f882a0ef0cc65c6781
Merge: c80e12c d3ad5cc
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 11 10:15:41 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-qtgui/grc/qtgui_sink_x.xml

commit c80e12c781db84cc9c6f7a17555a128e2aaf3433
Merge: 3518241 933af79
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 10 15:54:32 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-analog/examples/tags/CMakeLists.txt

commit 35182417223b10f7a3de9e5af1c845f1b58ce1d9
Merge: 4aec85d 4e54233
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 10 13:57:51 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/python/gnuradio/gr/hier_block2.py

commit 4aec85d2facecb751ab4f83b934e56a6d59037dd
Author: Tom Rondeau <address@hidden>
Date:   Fri Dec 7 19:36:43 2012 -0500

    build: fixes to build with PMTs and ControlPort.

commit 1e6824a11f652697cf7904d7f40567e8c0870caf
Author: Johnathan Corgan <address@hidden>
Date:   Fri Dec 7 10:52:22 2012 -0800

    core: fix missing gr_basic_block variable after merge fixup

commit ddb6ada4dbd0fa8db97ba6f2f4d2d8cb4149c8f1
Merge: 583ba9b 52ca5e2
Author: Johnathan Corgan <address@hidden>
Date:   Fri Dec 7 10:06:29 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/runtime/gr_basic_block.h

commit 583ba9b96ce3c3e52173cd847a0c00ff10c1cf85
Merge: 114e651 69990c3
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 6 14:11:40 2012 -0500

    Merge branch 'master' into next

commit 114e651726c116e38cfc54d5f56d22d8bb3e073b
Merge: 1788edc 53be45f
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 6 12:53:48 2012 -0500

    Merge branch 'master' into next

commit 1788edced647bc0d5178bbce5726a13e89bd9ef4
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 6 11:08:21 2012 -0500

    ctrlport: fix in cmake for OSX builds of ctrlport.

commit 9d64213b3714fe78a1d121b0e01edf27b5816ea7
Author: Tom Rondeau <address@hidden>
Date:   Wed Dec 5 20:16:52 2012 -0500

    ctrlport: using execute_process instead of add_custom_command for Python 
slice files.
    
    There were some race issues with the previous way. Doing it this way makes 
sure that the x_ice.py files are there when they need to be.

commit ecfea4868d6348885945406be217751ba09c1d75
Merge: f650d94 a47c548
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 4 15:50:40 2012 -0500

    Merge branch 'master' into next

commit f650d945097c7abf277c2490b9cc420a17aa32e7
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 4 14:20:58 2012 -0500

    ctrlport: forgot a check in the Python dirs for controlport.

commit aa87e97109fd5e83e96d757d9cc08903d3e88caa
Merge: aa29be0 be9a5bc
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 4 13:24:01 2012 -0500

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

commit be9a5bc1409e5d6447a92382f926394adf26800d
Merge: 744e351 cf18523
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 4 09:59:02 2012 -0800

    Merge branch 'master' into next

commit aa29be054648c23dd9771c2acc6198e92174bca9
Merge: 744e351 e0d7e52
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 4 11:38:47 2012 -0500

    Merge branch 'next-ctrlport' into next

commit e0d7e5251ed968007664a0c0314dd845381e8c76
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 4 11:36:38 2012 -0500

    ctrlport: cleaning up contorlport builds.
    
    I was getting confused with where ENABLE_GR_CTRLPORT was used, so this uses 
that in cmake and GR_CTRLPORT for the C++ and Swig files.

commit 649cdc20c9c33857fdcea3c94d91ed88ac6caae8
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 4 11:35:55 2012 -0500

    ctrlport: ControlPort requires SWIG 2.0, so we check for that here; 
everywhere else still uses 1.3.31 min.

commit 744e351c408eba97030aa25c31eeddd6139114db
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 3 23:08:35 2012 -0500

    qtgui: Python.h must be included first (it's even in the Python 
documentation) to avoid warnings.

commit 1e8588a330d7ea3a0632f2919b1de4811b22f800
Merge: 76906d9 ef74b48
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 3 22:55:21 2012 -0500

    Merge branch 'master' into next

commit d38a9796c00b0ba35ebaf0ff85c8cc62eac96e3b
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 3 21:43:39 2012 -0500

    ctrlport: gets rid of a SWIG warning.

commit 406e881106de9ce5d09fa6f4c24e08d8ef63cb49
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 3 19:43:50 2012 -0500

    ctrlport: fixing up controlport integration into gnuradio-core for merge 
with next.

commit 1fea3358fbb5796ca50475e55dd7f0d443f1cd73
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 3 19:42:59 2012 -0500

    Merging ctrlport2 into next branch.

commit 76906d9a6bab589abaa96e0dc115c45927f4570f
Merge: 61d921c 197aa3c
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 3 15:02:44 2012 -0500

    Merge branch 'master' into next

commit 61d921cb76c4ff5dd88f3484325b9423a4a549b5
Merge: 0bba4a0 7e7fbf2
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 1 22:14:59 2012 -0800

    Merge branch 'master' into next

commit 0bba4a09957d6aea03afcddca9e3b08d55fc4101
Merge: 920a232 6cecc46
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 1 22:13:31 2012 -0800

    Merge branch 'master' into next

commit 6cecc466359d54c6724a1e3c3ad9c700efc6fc7e
Merge: 94506a3 7b58aac
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 1 22:13:27 2012 -0800

    Merge branch 'maint'

commit 94506a3c335b0af009dca2718aade587231ff31e
Merge: 92cfb02 61c6043
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 1 22:11:37 2012 -0800

    Merge branch 'maint'

commit 61c6043043e2007754b71837b3e7e93fcc0dba4c
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 1 22:03:55 2012 -0800

    Revert "Force swig compile ordering in gnuradio-core"
    
    This reverts commit 86dd49f2b301fdd7e817632eeb2dcaf25c86af4c.

commit 920a2327a65dc1955313d761c9cf6e5ebe604a46
Merge: 0854e06 bce99b7
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 1 14:56:32 2012 -0800

    Merge branch 'master' into next

commit 0854e066e85a324a39cbdd095fa677221c421bc4
Merge: 9b35156 5dc1ccc
Author: Johnathan Corgan <address@hidden>
Date:   Sat Dec 1 13:49:43 2012 -0800

    Merge branch 'master' into next

commit 9b35156c927b6085c7fe3796542501a6aa6bcbbd
Merge: 1907e67 6cc8182
Author: Johnathan Corgan <address@hidden>
Date:   Fri Nov 30 23:00:33 2012 -0800

    Merge branch 'master' into next

commit 1907e670b5c3658a7c76f3f00ba239c95ab18210
Merge: 16bed38 4478cb8
Author: Johnathan Corgan <address@hidden>
Date:   Thu Nov 29 19:46:46 2012 -0800

    Merge branch 'master' into next

commit 16bed38aef25df384dca56143f298e081eac1972
Merge: e5046cd 92cfb02
Author: Johnathan Corgan <address@hidden>
Date:   Thu Nov 29 15:44:07 2012 -0800

    Merge branch 'master' into next

commit e5046cdd23e3c6a9aa584ae353f56cb19861d358
Author: Johnathan Corgan <address@hidden>
Date:   Thu Nov 29 15:43:26 2012 -0800

    Revert "core: adding msg_connect, updating msg interface, adding symbolic 
block names"
    
    (to be reapplied on master branch and re-merged in)
    
    This reverts commit 7fc857a18cdc47f333db56cfedd2a4ed1a8432a9.

commit abb330455b23284cccc286474e7943107ef7d73a
Merge: 645be56 0fbd169
Author: Tom Rondeau <address@hidden>
Date:   Wed Nov 28 21:17:10 2012 -0800

    Merge branch 'master' into next

commit 645be56af3c59a1d44efa4810f10f829b7f5b1b3
Merge: 45f7d83 90c7bad
Author: Tom Rondeau <address@hidden>
Date:   Wed Nov 28 20:08:01 2012 -0800

    Merge branch 'master' into next

commit 45f7d838982e14a2ea5b1f4d1c2f3c7fc6116764
Merge: ad64ece 680c889
Author: Johnathan Corgan <address@hidden>
Date:   Wed Nov 28 19:59:59 2012 -0800

    Merge branch 'master' into next

commit ad64eceff49f8bef33f66bdb23a3203dee77cd30
Merge: 5d9c526 ff81c84
Author: Johnathan Corgan <address@hidden>
Date:   Wed Nov 28 18:36:50 2012 -0800

    Merge branch 'master' into next

commit 5d9c5261c013a1054e8a20afeac8dcd7d1d52490
Author: Tom Rondeau <address@hidden>
Date:   Wed Nov 28 15:27:47 2012 -0800

    cmake: don't put etc under /usr.

commit 7fc857a18cdc47f333db56cfedd2a4ed1a8432a9
Author: Tim O'Shea <address@hidden>
Date:   Wed Nov 28 15:15:58 2012 -0800

    core: adding msg_connect, updating msg interface, adding symbolic block 
names

commit 12e279660e7300f42cbe993f89c8ad5ef6a3ea0a
Merge: e592990 fbef828
Author: Tom Rondeau <address@hidden>
Date:   Wed Nov 28 15:01:30 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/examples/demod/digital_freq_lock.grc
        gr-digital/examples/demod/pam_sync.grc
        gr-digital/examples/demod/pam_timing.grc
        gr-utils/src/python/CMakeLists.txt

commit e5929906700f3d6fa474fc5d9a8650b1fafbc2a1
Merge: 626fb35 61b9944
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 27 18:19:04 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/CMakeLists.txt
        gnuradio-core/src/lib/general/general.i

commit 626fb35ea298509f6ffa403d4abb20c6516f746c
Merge: 2e1b7a5 c941e8f
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 26 10:36:00 2012 -0500

    Merge branch 'master' into next

commit 2e1b7a5dc7af96054234af1e7a5c5f2abf21893b
Merge: 4d957e4 9ea88b7
Author: Johnathan Corgan <address@hidden>
Date:   Mon Nov 26 06:40:51 2012 -0800

    Merge branch 'master' into next

commit 4d957e4fb0fbe12e20c6890035f4b66b1a63115b
Merge: cc507e9 2d1d05a
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 24 09:37:31 2012 -0800

    Merge branch 'master' into next

commit cc507e9936dfc0adfb2e157f46acca4b39f6d125
Merge: 249e23f 8dcd5f3
Author: Johnathan Corgan <address@hidden>
Date:   Thu Nov 22 11:30:47 2012 -0800

    Merge branch 'master' into next

commit 249e23fcc83b48daf26d2dea78595c578a23fe03
Author: Martin Braun <address@hidden>
Date:   Thu Nov 22 09:51:57 2012 -0500

    filter: matched doxygen docs to reflect oldstyle change.

commit 93008c8fd2724054a289911fa97289b9730a09b1
Author: Tom Rondeau <address@hidden>
Date:   Wed Nov 21 11:11:49 2012 -0500

    filter: update IIR filter to have a constructor parameter for taps style.
    
    Old style (default) is the way it's always been.
    
    New style (oldstyle=False) is the new taps which are negated from the old 
style and generally how programs generate IIR filter taps.

commit a61c44ec72aa77b068a8ebe84ab69847ea02b808
Merge: c0b35b4 20de05e
Author: Tom Rondeau <address@hidden>
Date:   Wed Nov 21 10:23:54 2012 -0500

    Merge branch 'master' into next.
    
    Merged to keep sane; all .S files are gone in next.
    
    Conflicts:
        gnuradio-core/src/lib/filter/3dnow_float_dotprod_really_simple.S
        gnuradio-core/src/lib/filter/3dnow_float_dotprod_simple.S
        gnuradio-core/src/lib/filter/ccomplex_dotprod_3dnow.S
        gnuradio-core/src/lib/filter/ccomplex_dotprod_3dnow64.S
        gnuradio-core/src/lib/filter/ccomplex_dotprod_3dnowext.S
        gnuradio-core/src/lib/filter/ccomplex_dotprod_3dnowext64.S
        gnuradio-core/src/lib/filter/ccomplex_dotprod_sse.S
        gnuradio-core/src/lib/filter/ccomplex_dotprod_sse64.S
        gnuradio-core/src/lib/filter/complex_dotprod_3dnow.S
        gnuradio-core/src/lib/filter/complex_dotprod_3dnow64.S
        gnuradio-core/src/lib/filter/complex_dotprod_3dnowext.S
        gnuradio-core/src/lib/filter/complex_dotprod_3dnowext64.S
        gnuradio-core/src/lib/filter/complex_dotprod_sse.S
        gnuradio-core/src/lib/filter/complex_dotprod_sse64.S
        gnuradio-core/src/lib/filter/fcomplex_dotprod_3dnow.S
        gnuradio-core/src/lib/filter/fcomplex_dotprod_3dnow64.S
        gnuradio-core/src/lib/filter/fcomplex_dotprod_sse.S
        gnuradio-core/src/lib/filter/fcomplex_dotprod_sse64.S
        gnuradio-core/src/lib/filter/float_dotprod_3dnow.S
        gnuradio-core/src/lib/filter/float_dotprod_3dnow64.S
        gnuradio-core/src/lib/filter/float_dotprod_sse.S
        gnuradio-core/src/lib/filter/float_dotprod_sse64.S
        gnuradio-core/src/lib/filter/short_dotprod_mmx.S
        gnuradio-core/src/lib/filter/short_dotprod_mmx64.S

commit c0b35b4ec7c95e9d0e91d91edb81d854db2b2b72
Merge: a7dce67 afea463
Author: Johnathan Corgan <address@hidden>
Date:   Mon Nov 19 19:42:52 2012 -0800

    Merge branch 'master' into next

commit a7dce670c05c30ff2cd8dccd36c6c960a6992551
Author: Josh Blum <address@hidden>
Date:   Wed Nov 14 18:42:12 2012 -0800

    gr: added missing dependencies for unit tests

commit 8d4d5c1600f9baf1bb665b5925acdcdc7da11f6a
Author: Josh Blum <address@hidden>
Date:   Wed Nov 14 18:41:55 2012 -0800

    gr: reorder new components in order of dependency

commit aaaa251ab02a39b66ecd14111e5fb9afc01ef39d
Author: Josh Blum <address@hidden>
Date:   Wed Nov 14 15:02:19 2012 -0800

    fec: removed undefined variables FEC_LIB...

commit 4f4e571cef6a3cd64469901d654a1d4448e850d4
Author: Josh Blum <address@hidden>
Date:   Wed Nov 14 15:00:51 2012 -0800

    gr: misc test dependencies for new components

commit d809902ad340a2b45101b2fb03334ac50681526d
Author: Josh Blum <address@hidden>
Date:   Wed Nov 14 14:27:26 2012 -0800

    volk: fix popcnt in volk_rank_archs
    
    The naive ranking system uses a popcnt to see which impl matches the most 
archs.
    GCC gives us a builtin popcnt. MSVC also has __popcnt, but it seems to be
    segfaulting, probably because the rank archs.c is built arch indepdent.
    
    So, a manual popcnt has been implemented for all non gcc builin cases.
    This is superior because 1) it doesnt segfault, 2) it covers all compilers.
    
    Also note that the implementation does not have to be fast,
    this is a one-time lookup process while the kernel table is loaded.

commit 5c71424d3a6828ace96bf4a12040d68a4458168d
Author: Josh Blum <address@hidden>
Date:   Wed Nov 14 12:45:55 2012 -0800

    fec: fixed api export typo

commit 910c043857ba53d0ed462a212ebfdd1c3040062f
Author: Johnathan Corgan <address@hidden>
Date:   Wed Nov 14 10:12:37 2012 -0800

    gr: apply pattern for g37f7522 and gc4c0ce9 to gr-channels and gr-fec

commit 8e01e6f004fe9039cb833250231192438c982c0a
Merge: 01abe9f 315237f
Author: Johnathan Corgan <address@hidden>
Date:   Wed Nov 14 10:07:45 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-atsc/src/lib/CMakeLists.txt
        gr-digital/python/CMakeLists.txt
        gr-trellis/src/python/CMakeLists.txt
        gr-vocoder/python/CMakeLists.txt
        gr-wavelet/python/CMakeLists.txt

commit 01abe9f225dd73e6feae151e42c285dd3c880d54
Merge: ce4e0e6 ce1213e
Author: Johnathan Corgan <address@hidden>
Date:   Mon Nov 12 20:39:42 2012 -0800

    Merge branch 'gr-fec-next' into next

commit ce1213e615023fa5c43f75ba2d2ec54649025b8f
Author: Johnathan Corgan <address@hidden>
Date:   Mon Nov 12 20:36:05 2012 -0800

    fec: add new top-level component for FEC blocks
    
    Removed viterbi and reed-solomon from gnuradio-core

commit ce4e0e692de8802d458fd6c504c79f0f877d9557
Merge: 0613db3 5b568ab
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 12 22:10:18 2012 -0500

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

commit 0613db37aa3d87eb3cce2841fa210abc6b7f9c22
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 12 21:56:06 2012 -0500

    qtgui: Fixed some build issues and made sure all qtgui examples work.
    
    analog: also fixed having a default arg for noise_source seed in Python.

commit bbbbf8b042c3443415ae766bf7b6a26134c0119d
Merge: ea539a7 8740eb0
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 12 21:55:23 2012 -0500

    Merge branch 'qtgui_stylesheets' into next
    
    Conflicts:
        gr-qtgui/lib/DisplayPlot.cc
        gr-qtgui/lib/DisplayPlot.h
        gr-qtgui/lib/displayform.cc
    
    Fixed some function name issues and updated qtgui examples.

commit 5b568abe194f027860670317915c27c174fab52e
Merge: 63bb895 973a213
Author: Johnathan Corgan <address@hidden>
Date:   Mon Nov 12 18:42:18 2012 -0800

    Merge branch 'master' into next

commit 8740eb0d9460060ae97f9d252cae81cdcf0e20e5
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 12 21:12:18 2012 -0500

    qtgui: fixed a few bugs under qwt6. Made checks around the symbol pointers.

commit 63bb89504b71df66b8b459665b37b2ad5d79091c
Author: Josh Blum <address@hidden>
Date:   Mon Nov 12 14:38:48 2012 -0800

    digital: added missing library link to analog

commit b38a7f5696bd5f6afcb12739dddf9b9f89eb2ed2
Author: Josh Blum <address@hidden>
Date:   Mon Nov 12 14:32:15 2012 -0800

    gr_fxpt_xco: inline classes, nothing to export

commit ea539a77938c81bb046a6d83f3cf3f40eaa33c49
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 10 22:09:44 2012 -0800

    channels: switch to using gr-blocks

commit fd380cb2e0bfa999ecc053ab32916c7380e70ebb
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 10 22:08:59 2012 -0800

    blocks: fix includes to also include generated files

commit cd8b03e45ff50f6f65f57b2e62e70f725da638d4
Author: Tom Rondeau <address@hidden>
Date:   Sat Nov 10 16:25:30 2012 -0500

    analog: moved lfsr from gr-analog to gr-digital where it is used.

commit 0cf561018b60bd00b2315f77c7ee073acb6a8758
Merge: 611f7e4 2329b71
Author: Tom Rondeau <address@hidden>
Date:   Sat Nov 10 15:46:33 2012 -0500

    Merge branch 'next' into next_analog

commit 2329b7126c313e1492942655e28a2f59c89d30b4
Merge: 2f0985b cec59e9
Author: Tom Rondeau <address@hidden>
Date:   Sat Nov 10 15:46:14 2012 -0500

    Merge branch 'master' into next

commit 611f7e45e7a793f2489d76670a61493327838e3e
Author: Tom Rondeau <address@hidden>
Date:   Sat Nov 10 15:43:21 2012 -0500

    analog: fixing up GRC and other examples to use gr-analog for sig and noise 
sources.

commit 1155ff1e58fc3311f55f28d2e95f057708b99c7d
Author: Tom Rondeau <address@hidden>
Date:   Fri Nov 9 22:42:52 2012 -0500

    Fixed QA code for new component dependencies.
    
    constellation_receiver implements channel_model since gr-digital does not 
depend on gr-channels.

commit cbc7960a4facfc50c3861ca96e51348802d457cc
Author: Tom Rondeau <address@hidden>
Date:   Fri Nov 9 22:30:01 2012 -0500

    analog: removed noise and sig sources from core.
    
    Fixed QA code for components that do not use gr-analog.

commit 6be5d93ab0e9ec205f1cb72f8d2d60006b08e7f2
Author: Tom Rondeau <address@hidden>
Date:   Fri Nov 9 19:14:15 2012 -0500

    fixing up various QA issues with new components.

commit 908e0409de40e7c3a7c855f680ad568b1acd85e0
Author: Tom Rondeau <address@hidden>
Date:   Fri Nov 9 19:05:17 2012 -0500

    channels: adding new component gr-channels to hold channel models.
    
    Currently, only holds our simple channel_model block.

commit 2f78621b74296c397143371e30707024fa33d082
Author: Tom Rondeau <address@hidden>
Date:   Fri Nov 9 18:56:00 2012 -0500

    digital: fixed swig linking issue to gr-analog.

commit 988c73b0e9f012a1951cfa02b3054cf856a795dd
Author: Tom Rondeau <address@hidden>
Date:   Fri Nov 9 18:17:25 2012 -0500

    analog: removing rotator from gr-analog.
    
    Will go into gr-blocks (it's used in gr-filter). QA code is in 
gnuradio-core/.../filter but is not activated.

commit 0b1d665833530ff9120f55e132f95aa8013cefa2
Author: Tom Rondeau <address@hidden>
Date:   Fri Nov 9 18:08:12 2012 -0500

    analog: fixed a few build issues against gr-analog.

commit 2f0985b105885c9eed1e213dd6da5a2389288e53
Author: Tom Rondeau <address@hidden>
Date:   Wed Nov 7 00:12:45 2012 -0500

    qtgui: adding ability to save a qtgui sink.
    
    Right-click menu has a "save" option to take a snapshot of the figure.

commit 2553961b6e6a2543a81463b9a1ad2a44bf11bdf6
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 21:17:03 2012 -0500

    analog: removing frequency mod, phase mod, quad demod, and rail from 
gnuradio-core.

commit 111ec357548f3c810739a12ed8faead0a5935e0b
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 20:14:48 2012 -0500

    analog: removing cpfsk and cpm from gnurdio-core.

commit f86c6e0462f8208106d41e4be02b59c66ce50e5a
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 18:36:47 2012 -0500

    analog: removing gr-analog as a required dependency when not actually 
necessary.
    
    Examples that use gr-analog test for it first.

commit fd110bdbbe8bc40781c34f33c70deec5b7931109
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 14:28:22 2012 -0500

    analog: Removing reference to gr.sig_source_X and gr.noise_source_X where 
possible.
    
    Passing make and make test. Examples and apps need testing.
    
    gr-filter relies on sig_source and noise_source, so can't remove them from 
core.

commit 0c9c16fb008b02a5af39fb22e18acfff2dbd933a
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 12:26:57 2012 -0500

    all: Python, GRC, and examples to properly pull blocks from filter and 
analog.

commit 463b962fe280c5515947498b4d0f4fd3b5993662
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 12:25:58 2012 -0500

    analog: Removing all squelch blocks from gnuradio-core.
    
    Also updating some Python blocks and examples to properly pull from filter 
and analog.

commit 55eb2dbfc38ce4287c7408bf9a87c6b56a618d1f
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 11:11:31 2012 -0500

    analog: removing probe_avg_mag_sqrd from gnuradio-core.

commit 6167cf58f167fc65999237d1502461e5cc39c986
Author: Tom Rondeau <address@hidden>
Date:   Tue Nov 6 11:10:59 2012 -0500

    analog: fixing Python files to install and be usable as part of gr-analog.

commit a99beca4b60869f7d8ae1743ba4d72fd71461ad0
Merge: 3ca7aee 0617e68
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 5 22:50:46 2012 -0500

    Merge branch 'next' into next_analog

commit 0617e68d5f6406e9f18580823e3530b2b21d017a
Merge: 2ce9fa1 1db7838
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 5 22:45:24 2012 -0500

    Merge branch 'master' into next

commit 2ce9fa13996a9d3c61f3e3ac3b9119f272609eb9
Author: Tom Rondeau <address@hidden>
Date:   Sun Nov 4 22:26:01 2012 -0500

    qtgui: adding a save and exit menu to qtgui-based static plotting tools.
    
    Save will save the current plot as a jpeg, png, bmp, or tiff.

commit ced77908c7b813cd983147cc8c990893cb755171
Author: Tom Rondeau <address@hidden>
Date:   Sun Nov 4 18:33:11 2012 -0500

    qtgui: fixed static plot tools for new set_line_label name change.

commit d0694e70599197402e02a714cf4edb204aa8e296
Merge: 419d266 cc86201
Author: Johnathan Corgan <address@hidden>
Date:   Sun Nov 4 09:14:20 2012 -0800

    Merge branch 'master' into next

commit 419d266f61e1721c5222c4d23903728cec8b6ec7
Merge: 63bc052 a6d285d
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 3 13:21:32 2012 -0700

    Merge branch 'master' into next

commit 63bc052026f66b25b3d52879a9a132e168ef4ee6
Merge: 9f376ff 7167f2b
Author: Johnathan Corgan <address@hidden>
Date:   Fri Nov 2 10:40:20 2012 -0700

    Merge branch 'master' into next

commit 9f376ff32edd2e0d0132029111c9bdff9654d1b2
Merge: 49dadf2 747b670
Author: Johnathan Corgan <address@hidden>
Date:   Fri Nov 2 10:06:09 2012 -0700

    Merge branch 'master' into next
    
    Conflicts are from moving gr_channel_model into
    filter::channel_model.
    
    Conflicts:
        gnuradio-core/src/lib/hier/gr_channel_model.h
        gnuradio-core/src/lib/hier/gr_channel_model.i
        gr-digital/examples/narrowband/benchmark_add_channel.py
        gr-digital/examples/ofdm/benchmark_add_channel.py

commit 49dadf282dff3ab144ced916add4ef148b7378ba
Merge: a78f41a 58ebe83
Author: Tom Rondeau <address@hidden>
Date:   Thu Nov 1 11:47:00 2012 -0400

    Merge branch 'master' into next

commit 3ca7aee9244a80aa5f2d65cace16be40d4bf539f
Merge: 1b83549 a78f41a
Author: Tom Rondeau <address@hidden>
Date:   Thu Nov 1 10:54:25 2012 -0400

    Merge branch 'next' into next_analog

commit 1b83549181135e79ad00b9bae0d11ab27efa4148
Author: Tom Rondeau <address@hidden>
Date:   Thu Nov 1 10:50:10 2012 -0400

    analog: removing PLL blocks. Also moved blks2impl files that used PLLs to 
gr-analog.
    
    This probably impacts a lot of examples; once we've removed all files in 
gnuradio-core, we'll need to retest.

commit a78f41aa7e67fe9af490f86fe6ff5fe20256c09c
Merge: 59f9e55 d9a292a
Author: Johnathan Corgan <address@hidden>
Date:   Thu Nov 1 07:36:57 2012 -0700

    Merge branch 'master' into next

commit bbe599e4606b728c9610a17285b1e50f9e9d4dcb
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 31 20:05:09 2012 -0400

    analog: removed lfsr from gnuradio-core.

commit 66fd82ac5f87b55bb007b95ba9c7bfffe333b134
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 31 20:01:16 2012 -0400

    analog: removed all AGC blocks from gnuradio-core.
    
    Also replaces calls to gr.agc with analog.agc.

commit 59f9e558daeb3d148a26fbb56fedc8f1dac1a5bb
Merge: 1cd15f6 ac9430c
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 31 17:12:06 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/CMakeLists.txt
        gr-digital/include/digital_additive_scrambler_bb.h
        gr-digital/include/digital_descrambler_bb.h
        gr-digital/include/digital_scrambler_bb.h
        gr-digital/lib/CMakeLists.txt
    
    Conflicts were for adding dependency on gr-analog.
    additive_scrambler_bb_impl, descrambler_bb_impl, and scrambler_bb_impl were 
update to use LFSR from gr-analog.

commit 1cd15f64cb2b53219133bcb3821f76ecd2582ff5
Merge: 87e2bd3 fa4f1c2
Author: Johnathan Corgan <address@hidden>
Date:   Fri Oct 19 14:17:13 2012 -0700

    Merge branch 'master' into next

commit 1dbdd1511e8a05a1adb212a7b24750d500982462
Author: Ben Reynwar <address@hidden>
Date:   Mon Oct 15 10:51:39 2012 -0700

    qtgui: Adding hooks to allow appearance customization with stylesheets.

commit 87e2bd3dddd172eb8264ab12202659c18ba09880
Merge: bcb5c07 0b62e85
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 15 16:37:22 2012 -0400

    Merge branch 'master' into next
    
    Fixing some conflicts due to cherry-pick on master.
    
    Conflicts:
        gr-digital/grc/digital_constellation_receiver_cb.xml
        gr-digital/lib/digital_constellation_receiver_cb.cc

commit bcb5c077d3cd0cac072670667fe6cf18244b9efe
Merge: 004c4ec 28c0786
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 15 16:34:51 2012 -0400

    Merge remote-tracking branch 'benreynwar/next_constellation_scale' into next

commit 004c4ec578dbb7e1f58c0f3876bf87294d6a709e
Merge: 2d02b29 1360503
Author: Johnathan Corgan <address@hidden>
Date:   Sat Oct 13 12:11:16 2012 -0700

    Merge branch 'master' into next

commit 2d02b29a0f712faebd82fc17293f8ccd38045f78
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 12 15:41:50 2012 -0400

    qtgui: fixing qtgui time plot to use sample rate names instead of 
bandwidth/frequency.

commit 03bc909716749d961b89adc4809b4ad1d11ca157
Merge: 93f4ca6 2267dee
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 12 15:28:13 2012 -0400

    Merge branch 'master' into next.
    
    Moved changes to time_sink_{c,f}_impl.cc.
    
    Conflicts:
        gr-qtgui/lib/qtgui_time_sink_c.cc
        gr-qtgui/lib/qtgui_time_sink_f.cc

commit 93f4ca6187c409ab30e41fbdf5dace854d9d4c36
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 10 17:21:17 2012 -0400

    qtgui: allowing setting of axes in GRC.
    
    For time and freq, a y-axis range can be defined. The constellation plot 
has an x- and y-axis setting.
    
    Also made methods more consistent in their names and styles.

commit da14674efba47b8d194a462f95a80613d5098e1c
Author: Tom Rondeau <address@hidden>
Date:   Tue Oct 9 23:56:43 2012 -0400

    qtgui: adds ability to set a plot's title.

commit 637a987e18429843906d362a8960dd4663676363
Author: Tom Rondeau <address@hidden>
Date:   Tue Oct 9 23:18:13 2012 -0400

    qtgui: updating some function names for more accuracy and to allow an 
actual set_title.

commit 68823d4ee894a06317e4258c38537582188473ec
Merge: a84859a f4adf33
Author: Johnathan Corgan <address@hidden>
Date:   Fri Oct 5 16:13:02 2012 -0700

    Merge branch 'master' into next

commit a84859a19ce707524157d9ba9756e73eb99b2b5b
Merge: 62ab037 d89012d
Author: Johnathan Corgan <address@hidden>
Date:   Wed Oct 3 20:21:31 2012 -0700

    Merge branch 'master' into next

commit 62ab0377d5ba26ac63f97c8e3802c7cd1a92f18c
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 3 22:27:23 2012 -0400

    qtgui: adding menu option to qtgui sinks to set transparency (alpha) value 
on lines/markers.

commit 48feecf3eaf2b16d0e211dcb5690aeb0f22d9c0d
Merge: 3a50fdf c151fdd
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 3 12:56:51 2012 -0400

    Merge branch 'master' into next

commit 3a50fdf70947dea210242b6f5647435fc0117845
Merge: ef86dbf d7b57e4
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 3 12:26:59 2012 -0400

    Merge branch 'master' into next

commit ef86dbf72f97a7a9a3b25b1ea94eb32bf609db53
Merge: a8d97ba be0c7ca
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 1 22:42:42 2012 -0400

    Merge branch 'master' into next

commit a8d97bade40dbb1680fde30f698068c8fa671f77
Merge: 102b704 d597300
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 1 16:28:30 2012 -0700

    Merge branch 'master' into next

commit 102b7040171f702f1112d920d372d3122c8bf027
Merge: f37d621 b31ea99
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 1 18:20:36 2012 -0400

    Merge branch 'master' into next

commit 28c0786bccd2069c9b34dad6968544875af47567
Author: Ben Reynwar <address@hidden>
Date:   Sun Sep 30 21:27:34 2012 -0700

    digital: Add symbol output to constellation_receiver block for debugging.

commit d4c91c146f50059eca1ccab9bb5a9f96fbe31c42
Merge: 35e508c 33d9cf8
Author: Ben Reynwar <address@hidden>
Date:   Sun Sep 30 20:48:42 2012 -0700

    digital: merge in QAM bug fix from master

commit f37d62121f091b16fd07b418fef5f8f244c49b6f
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 30 21:01:23 2012 -0400

    howto: moving C++ QA code to cppunit.

commit 505bab9a6c43ef7fd3c815fa92bb90a05a9f2fac
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 30 13:34:26 2012 -0400

    howto: updated howto-write-a-block to use new impl style.

commit 3283a40bef17d3b2579d8cfbd231dd384b27af41
Merge: 4cf6811 35e508c
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 30 11:13:11 2012 -0400

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

commit 35e508c6e9462191491ac2c2eae62e60b244d99c
Merge: 91d6306 65ea256
Author: Johnathan Corgan <address@hidden>
Date:   Sat Sep 29 21:55:27 2012 -0700

    Merge branch 'master' into next

commit 91d630638d6cbe237f0fa1a978f3161a9a041895
Merge: ecc8f73 515d1b6
Author: Johnathan Corgan <address@hidden>
Date:   Fri Sep 28 10:11:50 2012 -0700

    Merge branch 'master' into next

commit ecc8f73c367fbd7fed43aae67dea67261e374a8b
Merge: 4200a7b 96f181f
Author: Johnathan Corgan <address@hidden>
Date:   Thu Sep 27 11:29:03 2012 -0400

    Merge branch 'master' into next

commit 4cf68113aa79599b019ebad9e0b55349f6287c5e
Merge: f9d6bf9 21b3982
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 23 17:41:12 2012 -0400

    Merge branch 'master' into next

commit f9d6bf96a8210f760836e8f72ab435893b1616c2
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 23 17:03:21 2012 -0400

    digital: fixed naming for GRC file.

commit 4200a7b49b8fd28baa0737e7f98d5217bc16272f
Author: Gerald Baier <address@hidden>
Date:   Sun Sep 16 17:53:53 2012 -0400

    digital: fixed GRC file for PFB clock sync block to properly take in loop 
bandwidth parameter.

commit 4a3534ecd8613443e549df8b1b36b02a7622cda7
Merge: d2d1ff3 c85bd69
Author: Johnathan Corgan <address@hidden>
Date:   Mon Sep 10 08:50:15 2012 -0700

    Merge branch 'master' into next

commit d2d1ff3cad15bc244c93ccb4457cdc26c6af6510
Merge: d857caa 04e6e57
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 9 14:40:57 2012 -0400

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

commit d857caa7f1a703731c69fdcdd1fdb6c7d0a99a7c
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 9 14:34:08 2012 -0400

    digital: Fixes LMS and CMA equalizers.
    
    filter: updated fir_filter_* by adding a method that allows the update of a 
single tap in the filter in a way that propagates to all of the aligned tap 
vectors. Mostly to support the adaptive equalizers.

commit 43eaedf41a4281370cb71cf0bddf891d3867698c
Author: Tom Rondeau <address@hidden>
Date:   Sun Sep 9 09:05:19 2012 -0400

    filter: moving filter design tool from gr-utils to gr-filter.

commit 04e6e5701546124f2ed4aca49c1a30afe27e00db
Author: Josh Blum <address@hidden>
Date:   Fri Sep 7 13:09:36 2012 -0700

    core: dont export totally inline classes
    
    These classes have no symbols actually grounded in the core library.
    Due to this exporting the class seems to confuse MSVC.
    Commenting out GR_CORE_API makes MSVC and gcc happy.

commit 1def9c5e349f22560d6ff84ca4baf85a0019555c
Author: Josh Blum <address@hidden>
Date:   Fri Sep 7 12:57:03 2012 -0700

    qtgui: fix log10 ambiguous overload in DisplayPlot

commit ee3d98e85a2886f20457c1842a4d2dee9c89c42a
Author: Josh Blum <address@hidden>
Date:   Fri Sep 7 12:54:07 2012 -0700

    wavelet: fix API export declarations

commit eb738d1b6b4887bc475d83156985c25ba679b995
Author: Josh Blum <address@hidden>
Date:   Fri Sep 7 09:56:41 2012 -0700

    cmake: copy stdbool for gnuradio as well

commit b7a22f8b004eb7a88708fba7db2203462211921e
Author: Ben Reynwar <address@hidden>
Date:   Tue Sep 4 21:28:42 2012 -0700

    Examples: Fixed minor bugs in examples and blks2impl from namespace changes.

commit 8ea61b3501dcb8bcba00b490ae558327df57c830
Merge: 0104d8f a4e2e8a
Author: Johnathan Corgan <address@hidden>
Date:   Tue Sep 4 17:39:46 2012 -0700

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

commit 0104d8fa3ce84a4b7484b66e5236082adaeb9464
Merge: 3d2612a 4180e5e
Author: Johnathan Corgan <address@hidden>
Date:   Tue Sep 4 17:13:18 2012 -0700

    Merge branch 'master' into next

commit 3d2612aee54d1b7f5155a827a72d7529d955c1b3
Merge: 07d95f6 ac4cf0f
Author: Tom Rondeau <address@hidden>
Date:   Tue Sep 4 16:30:25 2012 -0400

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

commit 07d95f62bd8ab6f7367da25ef225169c18994504
Merge: c09d1dc 986b8f0
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 3 14:10:12 2012 -0400

    Merge branch 'master' into next

commit ac4cf0f99ea37c6c8058bf0ce47c7790663509b9
Author: Josh Blum <address@hidden>
Date:   Sat Sep 1 11:45:04 2012 -0700

    volk: ensure LV_HAVE_GENERIC always defined

commit 18f94d0cc22bfe1fc8c1f6893fb8266f8ead6a59
Author: Josh Blum <address@hidden>
Date:   Fri Aug 31 18:38:05 2012 -0700

    volk: remove the generation of _g variant

commit 68828bef94ffa018807ab1a1178895336cdc3fee
Author: Josh Blum <address@hidden>
Date:   Thu Aug 30 20:36:43 2012 -0700

    volk: convert kernels one last time, removed old kernels
    
    Please use the new kernel style in kernels/volk.
    One file with both generic, and possibly aligned and unaligned 
implementations.
    The kernel may have a custom dispatcher.
    See kernels/README.txt

commit 464562464b58821dc64c56f131b4f04b0f618451
Author: Josh Blum <address@hidden>
Date:   Thu Aug 30 20:29:20 2012 -0700

    volk: commit the super squash (volk dir only changes)

commit c09d1dceb9a82beaf051d011100a0c068b7581c4
Merge: 297ee1e 0e2f0c6
Author: Tom Rondeau <address@hidden>
Date:   Thu Aug 30 21:10:29 2012 -0400

    Merge branch 'master' into next

commit 297ee1e1eac9766ede38151e2a6350f486f4e381
Merge: 00c2ef1 1d2c26d
Author: Johnathan Corgan <address@hidden>
Date:   Thu Aug 30 17:42:29 2012 -0700

    Merge remote branch 'jblum/volk_next_use_num_points' into next

commit 00c2ef1ffb803d06e3405dd79c5c59782b5699dd
Merge: 5892c29 873585c
Author: Johnathan Corgan <address@hidden>
Date:   Thu Aug 30 17:12:50 2012 -0700

    Merge branch 'master' into next

commit 1d2c26d6cc6c11dbbf11a605429fafa79f05d7ec
Author: Josh Blum <address@hidden>
Date:   Thu Jul 5 00:20:02 2012 -0700

    filter: fix use of volk_32fc_x2_dot_prod_32fc_a for num points

commit 2105aad243e2da01af914b5307712db6f4489d9c
Author: Josh Blum <address@hidden>
Date:   Mon Jul 2 15:17:03 2012 -0700

    volk: replace num_bytes with num_points in many kernels
    
    num_points is simply more intuitive than num_bytes
    We expect to pass in the number of array elements.
    This may have been the source of some test failures
    when random numbers of points were interpreted as bytes,
    you get caught slicing points/items down the middle...

commit 5892c29ee0509ff8aa226f14da524f7ec30f9654
Merge: 7adff51 fc4d370
Author: Johnathan Corgan <address@hidden>
Date:   Tue Aug 28 12:52:09 2012 -0700

    Merge remote branch 'reynwar/comments_next' into next
    
    Conflicts:
        gr-digital/include/digital_constellation.h
        gr-digital/python/bpsk.py
        gr-digital/python/qpsk.py

commit 7adff515181de5cfbd7392d934cac9083a8a6a58
Merge: 67fa1a5 ef66487
Author: Johnathan Corgan <address@hidden>
Date:   Tue Aug 28 12:17:30 2012 -0700

    Merge branch 'master' into next

commit 67fa1a58925d4b22418fcaffe328a20058e1d77b
Merge: 9336479 6e944a7
Author: Johnathan Corgan <address@hidden>
Date:   Tue Aug 28 12:03:22 2012 -0700

    Merge remote branch 'jblum/fix_private_access' into next

commit 933647925708c4349676548705f4e4afcf522926
Author: Johnathan Corgan <address@hidden>
Date:   Tue Aug 28 10:11:58 2012 -0700

    digital: fix missing include

commit 7e312ed50faf64705089ee550000efd34c719c57
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 28 00:02:52 2012 -0400

    docs: fixed doxygen markup issues.

commit 285ea24f3f033e97a907c01c6b135ca8662d8a8f
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 27 22:12:39 2012 -0400

    digital: fixed remaining GRC blocks.
    
    Also fixed some issues with OFDM mod/demod with other new components.

commit b4c96386b86147a175231385c0cc4eafe8e9f8b3
Author: Tom Rondeau <address@hidden>
Date:   Wed Aug 22 21:19:43 2012 -0400

    digital: wip on ensuring all digital blocks work in GRC.

commit eec6ae88e6da7fd72bc2dfc0f0f2e1dc23238db7
Author: Tom Rondeau <address@hidden>
Date:   Wed Aug 22 21:19:01 2012 -0400

    fft: adding missing item to cmake install.

commit 695278bc00c8203389a917190563b0a22fea800d
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 21 23:38:27 2012 -0400

    digital: fixed up documentation and default values of digital blocks.

commit 3757197293ef59fe08caa9f391f9e77f072ea19f
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 21 22:17:20 2012 -0400

    filter: fixing PFB GRC blocks.
    
    Removing from grc dir and using Python-wrapper blocks for GRC components in 
gr-filter. Updated Python wrapper to take an empty tuple (generated by GRC when 
no input for a vector type) to auto-generate the taps for the PFBs.

commit 4a60c41913d7ebddf666d24e288533b453ee41ae
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 21 18:39:10 2012 -0400

    core: fixing location of some components for the new hierarchy.
    
    ctest and digital examples working again.

commit 5f720e1beb27f7457f20555f8ce1bb8c34c27cbe
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 22:49:38 2012 -0400

    filter: cleaning up GRC filter blocks.

commit 527dc0e6ec8008bdfc18a2f690596cac34a77080
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 22:25:06 2012 -0400

    core: removed fft blocks from core (now only in gr-fft).

commit 405ea9816cb2ef7f4277c1701d5583ff618ec2cb
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 22:13:58 2012 -0400

    filter: fixed names of filter GRC blocks.
    
    GRC files are installed into a flat directory; use prefix to keep from 
having a name collision.

commit 3c6b7b04a24e9a9553ecefa49ecb53e6792535fb
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 22:13:17 2012 -0400

    fft: fixed names of FFT GRC blocks.
    
    GRC files are installed into a flat directory; use prefix to keep from 
having a name collision.

commit 285b91b40804853a2dd29610278b4faa57b69392
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 21:55:00 2012 -0400

    trellis: fixing trellis examples for gr-filter update.

commit d16a9e334129c72dc1bb44fc8c1e4307f50e4e93
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 21:54:25 2012 -0400

    core: fixed default upper-limit on noutput_items to make sure we don't 
normally hit it.

commit 372c129f932236fb0bacb83a8c8994171eb4d018
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 21:08:24 2012 -0400

    trellis: updating gr-trellis to handle changes with gr-digital.
    
    (mostly namespace issues in C++).

commit 8ba8d63dc8cd70b88c537d5ec12d153581f7ef2c
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 19:54:55 2012 -0400

    core: allowing gri_control_loop to be a pure-virtual parent class.

commit e7de8a7b826d5cbd9c9358d96ab44d115fa53524
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 20 19:54:05 2012 -0400

    digital: fixed up digital blocks to make examples work again.
    
    Added GMSK loopback to test that block, too. Switched a couple over to 
qtgui instead of wx.

commit a8f91e9cca303d13fa153e8995fe8d093e3217ab
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 18 11:08:06 2012 -0400

    digital: cleaning up.

commit a20c676a1a33c6a869844ce92f351e5ae8cfa044
Author: Tom Rondeau <address@hidden>
Date:   Fri Aug 17 22:32:32 2012 -0400

    digital: cleaning up.

commit 5a92a70e6e4c9dd3a92055a772e01a9dee2df255
Author: Tom Rondeau <address@hidden>
Date:   Fri Aug 17 22:31:02 2012 -0400

    digital: converted OFDM blocks to new style.

commit 76a6f912706313fdc256b09aa17eeaf275e1fbc4
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 14 22:28:47 2012 -0400

    swig: adds a macro to allow us to specify different factory functions 
besides 'make' for a block.
    
    digital: converted cpmmod to new style.
    
    gmskmod inherits directly from cpmmod with just preset args. Defining 
another factory function, make_gmks_bc, here to make this all handled 
internally.

commit 6e944a77f14794bb143e85779387234ee412774f
Author: Josh Blum <address@hidden>
Date:   Tue Aug 14 23:00:16 2012 -0700

    core: fix use of private vars in place of API accessor

commit c537cf7d85f59db21c98ac859bc08fbe55031314
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 14 21:00:26 2012 -0400

    digital: converted equalizers and fixed cma equalizer.

commit e45449570984c0a709a21ea5ab078f9747e4b9c5
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 14 20:27:10 2012 -0400

    digital: converted packet_sink to new style.

commit 0298cf616a3635bfda4e8f58eae7b23af901c36b
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 14 20:07:00 2012 -0400

    digital: converted framer blocks to new style.

commit 29a019d2761f8001f2c132968c67b060a0ba24bc
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 14 19:39:08 2012 -0400

    digital: moved metric_type.h to digital include dir. Fixed gr-trellis to 
work with this.

commit ab479e3d5b5d77eb4133dd06ea3ffc51551fccd6
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 14 19:23:41 2012 -0400

    digital: converted mpsk_receiver to new style.

commit fc4d37062c46886d3bc1fb0b6c3626d779be4ecd
Author: Ben Reynwar <address@hidden>
Date:   Tue Aug 14 10:28:23 2012 -0700

    docs: Modified argument formating in python docstrings in grc.

commit 3e46aef392ba9b2e63bbfefefdb7178cc87049ab
Author: Ben Reynwar <address@hidden>
Date:   Tue Aug 14 07:12:53 2012 -0700

    docs: Changed arguments in python docstrings to new formatting style.

commit 48a95b3469febf4929c74f41beac6b33ab77566e
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 14 00:00:14 2012 -0400

    digital: converted mpsk snr and probes to new style.

commit 509fddb30a70862b31b0488acfbbdf523b48af0d
Author: Tom Rondeau <address@hidden>
Date:   Mon Aug 13 22:38:45 2012 -0400

    digital: converted scrambler code to new style.

commit fe96ee8d82b2666951cf3cef8f7f5d991396273f
Author: Ben Reynwar <address@hidden>
Date:   Mon Aug 13 13:46:28 2012 -0700

    docs: Formatted python docstrings for sphinx docs.

commit 719ebae8fb75635f1291e21b74af69cbdefe4837
Author: Tom Rondeau <address@hidden>
Date:   Sun Aug 12 22:36:39 2012 -0400

    digital: converted correlator blocks to 3.7; everything to make 
qa_correlate_access_code work.

commit 78d149cd3d230ca9310401496e5770401aeb478c
Author: Tom Rondeau <address@hidden>
Date:   Sun Aug 12 19:42:31 2012 -0400

    digital: updated blocks to make qa_constellation* tests pass.

commit a6e56683cf74054fad6774138bea9f844c76be09
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 11 11:04:03 2012 -0400

    digital: converted over constellation and related blocks.
    
    Possibly still a work-in-progress. Need to convert over some more before QA 
can be run.

commit af0a5780201c71c8f2d682cdab2274942e5771d5
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 11 11:03:21 2012 -0400

    digital: fixed formatting of code to properly comply with new standard.

commit 5aaea26d457b7ed4c19096072b46b15b4e3f54b4
Merge: b7cf0bf a61ddc2
Author: Tom Rondeau <address@hidden>
Date:   Fri Aug 10 19:48:37 2012 -0400

    Merge remote-tracking branch 'jcorgan/wip/filter-rm-next' into digital_impl
    
    Conflicts:
        gnuradio-core/src/lib/filter/CMakeLists.txt
        gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c
        gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c
        gr-digital/include/digital_clock_recovery_mm_cc.h
        gr-digital/include/digital_clock_recovery_mm_ff.h
        gr-digital/include/digital_cma_equalizer_cc.h
        gr-digital/lib/CMakeLists.txt
        gr-digital/lib/binary_slicer_fb_impl.h
        gr-digital/lib/digital_clock_recovery_mm_cc.cc
        gr-digital/lib/digital_clock_recovery_mm_ff.cc
        gr-digital/lib/digital_cma_equalizer_cc.cc
        gr-digital/swig/CMakeLists.txt

commit b7cf0bf00b404c37214e3b617bf53862741f76e7
Author: Tom Rondeau <address@hidden>
Date:   Fri Aug 10 19:44:23 2012 -0400

    digital: updating cma_equalizer style.

commit 41041c3d2d1468c4d37f9ed36a3b172b3d60da9c
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 12:07:43 2012 -0700

    docs: Updating sphinx docs for changes to new block style.

commit 370afff335cf9903408dcf6dd72638fc632faea3
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 11:52:12 2012 -0700

    docs: Updating sphinx docs for movement of blocks from gr to digital.

commit 87418936858f6e674c006b84ecfc0a6fd9feacfe
Merge: fbb1abb 9be7c30
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 11:20:30 2012 -0700

    Merged comments branch into comments_next branch.

commit fbb1abb0e7606fb81783e3c5bd511856355f6b27
Merge: 1f57cf3 9d8c03e
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 11:11:45 2012 -0700

    Merge branch 'next' of http://gnuradio.org/git/gnuradio into next

commit 4fcfe4fc01207dfaa941c6b334a7d8e40ccfcb81
Author: Tom Rondeau <address@hidden>
Date:   Thu Aug 9 21:30:50 2012 -0400

    digital: converted clock recovery MM loops (cc and ff).

commit 45502b80d28e2051f5f7780e0c386147f0976798
Author: Tom Rondeau <address@hidden>
Date:   Thu Aug 9 20:48:18 2012 -0400

    digital: converted binary_slicer_fb to new style.
    
    Also removed bytes_to_syms. This had been deprecated for a while.

commit 38069c9ac14b44597ee053486ca00838c758a47c
Author: Tom Rondeau <address@hidden>
Date:   Thu Aug 9 20:30:09 2012 -0400

    digital: converting to new pimpl standard for 3.7.
    
    Structure is basically set up. Additive scrambler converted.

commit 9be7c30d6df3fb8bd75db0659fa7a7d163d65657
Merge: c27d9d3 9305abf
Author: Ben Reynwar <address@hidden>
Date:   Wed Aug 8 14:26:07 2012 -0700

    Merge branch 'master' into comments

commit 9d8c03e8d6bd322661765e7ebc740dbdd743b798
Merge: 32e296d 9305abf
Author: Tom Rondeau <address@hidden>
Date:   Sun Aug 5 18:27:09 2012 -0400

    Merge branch 'master' into next

commit 32e296de0336feab694fb3b20a7ae1ea2595a1f4
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 23:37:27 2012 -0400

    qtgui: fix to time plotter to find core py file.

commit 05f6087695681f71796f3a2c59fcd5788b9014cf
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 23:36:30 2012 -0400

    qtgui: fixing other menu behavior with qwt5.

commit 1b71820ae56a6e0ac1544985b26bd9a3344c4702
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 23:13:31 2012 -0400

    qtgui: when displaying name, remove full path and only use file name.

commit 8b9a46be56a9e8146aeded28fec6dce0b99cb1a2
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 23:12:44 2012 -0400

    qtgui: fix to work with Qwt5.

commit d253890c08d3b5bb6c989dd278970e8f00294e9f
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 14:48:19 2012 -0400

    qtgui: QA code reflects change in waterfall plot API.

commit 9902b1d9a9e0f5878b7f89e2a46e80aeda565d57
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 14:46:27 2012 -0400

    fcd: fixed copy-paste error.

commit ce46d1524e5c178e6e7ab9d6d55f0bd824d8adf2
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 14:44:29 2012 -0400

    qtgui: removing missed debug lines.

commit d36e9ce1fecfd992c05f40170653309cc9bc91f0
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 14:42:30 2012 -0400

    qtgui: small fixes to qt_digital app.

commit 35a1402fc4ed3f29e1693706886bc633aa35febb
Merge: 7ada63b eb4305b
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 14:27:49 2012 -0400

    Merge branch 'qtsink_menus' into next

commit eb4305b92f0128c47743b4e2df032a04052ac21d
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 14:19:09 2012 -0400

    qtgui: introduces new static plot tools for different data types.
    
    Time, PSD, and Spectrogram have tools for char, short, int, float, and 
complex data types. Constellation requires complex inputs.
    
    These tools are now installed into the runtime bin directory.

commit 0eea9a33a1a57473973709662eb734d54df647fa
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 29 14:18:34 2012 -0400

    qtgui: floating point PSD sink handles fftshift.

commit 7ada63b93577624c9ec0a8cb0dfabfd481af9260
Author: Jeff Long <address@hidden>
Date:   Sun Jul 29 10:28:55 2012 -0400

    tags: some fixes to the tagged_file_sink block.
    
    The name of the tag was incorrect and improved behavior when updating info.

commit 4af111d33591542348fa5a8d952c0fd685294163
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 28 18:36:27 2012 -0400

    qtgui: fixing up apps for static displaying of samples.

commit 14f4e314fb72707e6ed030fdcd1ba7c383daabab
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 28 17:32:28 2012 -0400

    qtgui: waterfall plot couldn't really handle multiple signals.
    
    This keeps the internal mechanisms in case we figure out how to do this, 
but turn off ability to set multiple input signals from the API.

commit 36437ed2e41130984e0e0ef05aca909bf086a793
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 28 17:30:44 2012 -0400

    qtgui: set number of samples to plot in time sinks from GR block.

commit c0444b268f5bda1153480593cdfd5499080a1c1c
Merge: 65b7bba 7e0bf75
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 26 15:01:30 2012 -0400

    Merge branch 'master' into next

commit c414f1ef8401396cb7e3f22effd6f4b718ef0eb2
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 24 12:30:29 2012 -0400

    qtgui: created menu item to set color map of waterfall plots.
    
    Also cleaned up a few things.

commit 582dc9b920918b2589e97679dcc0e2fbecb12aa2
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 24 09:49:53 2012 -0400

    qtgui: fixes to waterfall plots.
    
    Fixes number of items returned, a bit of speed improvements, and ability to 
auto scale through menu.

commit 303489b78f95b6b3e6cd80a466c141fafecd4191
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 24 09:48:06 2012 -0400

    qtgui: fixing up sinks to make sure buffers are properly zeroed and right 
number of items is returned.

commit be72d11e4ef89e78863c3244be8e360fb71c5477
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 24 09:45:46 2012 -0400

    qtgui: fixing namespace to reflect new implementation style.

commit 3152d29dcc16f93e98e2a3cc2601c8712133e174
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 19 22:41:15 2012 -0400

    qtgui: constellation plots can use menu item to set number of points to 
plot.

commit bb1fa331b972cc46ecf0dfcf156ba004803721aa
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 19 22:33:46 2012 -0400

    qtgui: new menu options.
    
    Can set FFT window type for PSD and spectrogram plots and number of points 
to plot in the time plots.

commit 005cfe8ef78177c15fab850ac72365079efdd05c
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 19 22:33:28 2012 -0400

    filter: make a 'none' type for filter windows.

commit adfd275a634c9df8391d1b912185f1c46531f334
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 19 22:28:35 2012 -0400

    volk: fixed unaligned deinterleave to use unaligned load/store.

commit bf00bf4484e273beceedf8dffef6620cdb0f9c17
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 19 20:28:13 2012 -0400

    qtgui: changed qtgui sinks to pimpl structure.

commit 65b7bbac43663a3f10e4a4a123cdb851fac6e3bc
Merge: 4285c5a 267ac52
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 19 19:29:14 2012 -0400

    Merge branch 'master' into next

commit 47b99fb2bcce8531726fdce637c69367f6b7468c
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 17 22:28:09 2012 -0400

    qtgui: wip: moving qtgui over to new pimpl style.
    
    Everything but full sink has been converted.

commit fbdf83e472da67239d4cbdcb47f83ea7df108aa8
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 17 19:35:34 2012 -0400

    qtgui: Updated qtgui to use gr-fft components.
    
    Also updates qa code for style.

commit 93dfc3d4dcd18e43baec4f9166b7501fdf254944
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 17 19:34:33 2012 -0400

    qtgui: fix for constellation to set maker style after style has been 
created.

commit 4285c5af546590909c995d515356e9a2a72bf609
Merge: 79482d0 7c8347c
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jul 17 15:41:32 2012 -0700

    Merge branch 'master' into next

commit 86ed4ebf7869baa3b6d8d0018c22893be65f9f10
Merge: 11ce14e 7462598
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 17 18:25:00 2012 -0400

    Merge branch 'next' into qtsink_menus

commit a61ddc223da190476b38f891ea425f44d8c5f269
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 23:00:18 2012 -0400

    digital: fixed narrowband BER test.

commit d7190928b79f15e036dced7fc9f4a5c8ed39c4d7
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 22:51:06 2012 -0400

    digital: fixed narrowband voice example and OFDM code to use gr-filter.

commit 25166c11ad7e438dd3673edca36b3a23ee8ec0dd
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 22:43:46 2012 -0400

    digital: fixing narrowband (de)mods and examples to work with gr-digital 
and gr-filter components.

commit f51f49c7cd1b5c1bd10c243f479ac8f9ebb3f3d3
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 21:29:59 2012 -0400

    digital: tweak to MPSK QA code.

commit 7a91bcd3492620003b5fc7b55704509798e70741
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 21:29:42 2012 -0400

    digital: fixed GFSK component to use gr-filter component.

commit d5ced1615d024c220039fc5fe5db2c93dfadcc3a
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 21:28:42 2012 -0400

    digital: fixed FLL loop to use gr-filter component.

commit 2faee9d759397d11ea4ecc0b7dbe7246c26e059e
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 21:27:44 2012 -0400

    wxgui: update wxgui components to use gr-filter component.

commit bad5755f39ef34a6b120fee252230c08090e85f4
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 21:25:43 2012 -0400

    digital: fixed demod examples to work with gr-digital and gr-filter 
components.

commit ac8fef002ab04c23e512f7177fa586500ad4db4b
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 16 20:37:08 2012 -0400

    atsc: updating atsc component to work with gr-filter.

commit 79482d059ab08b3564e6151a66babb0b6f5ac47e
Merge: 7462598 209e98f
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 16 14:42:46 2012 -0700

    Merge branch 'master' into next

commit 11ce14eecc0ce37826060b9de9e9da439ac32967
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 15 16:02:44 2012 -0400

    qtgui: wip: some fixes to make updating markers/symbols Qwt5/6 compatible.

commit 7462598d180d6084a8f84ca872b36e3900dc8359
Merge: b5e649c 1979696
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 15 14:56:07 2012 -0400

    Merge branch 'master' into next

commit 0f34c5f16acdc8b6febc5e57335ef66ec771eb9f
Merge: 6d1b7b7 b5e649c
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 9 20:31:46 2012 -0700

    Merge branch 'next' into wip/filter-rm-next

commit b5e649cc9c781986ebca70c0117abf3f9ebdb11c
Merge: 8513c8d e1cfa5e
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 8 18:28:31 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/grc/digital_dxpsk_demod.xml

commit 6d1b7b7a8884675299b215fb5f93367f47fe1ccc
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 8 12:48:38 2012 -0400

    digital: improving QA tests to test more samples with better data.

commit 664c4cc11da6e4f0b0e2de536fc571f076fe075a
Author: Tom Rondeau <address@hidden>
Date:   Sun Jul 8 10:16:46 2012 -0400

    vocoder: make vocoder depend on gr-filter (and by proxy gr-fft).

commit 52eb89c5c87ebccd8a7c3a5294880d367a21691a
Merge: 43d42c5 8513c8d
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jul 7 15:35:36 2012 -0700

    Merge branch 'next' into wip/filter-rm-next

commit 8513c8d741f8702462bab1ac5a5ba565793dee54
Merge: 107b131 3a142be
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jul 7 15:18:51 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/CMakeLists.txt

commit 43d42c5d6df6750149d8a52ff4095214d351ccc3
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 7 10:50:52 2012 -0400

    digital: fixing up some examples to use new namespaces.

commit 6bd21600366e45aba04957a283953c6b812d433e
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 7 09:15:14 2012 -0400

    filter: updated adaptive filter blocks to use adaptive FIR kernels.
    
    These are basically dummy blocks, more as a way to show how to create them.

commit 29e2cb7c8b0feed0d792085491d562a6ce12d639
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 7 09:01:40 2012 -0400

    filter: adjusting adaptive fir; set and get taps should come from parent 
fir filter.

commit 91f0a41faf57c0e0796fda177f44bee55919e996
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 7 09:01:06 2012 -0400

    filter: fixing a typo.

commit 5a69e6ec6782848baf924c8bf3ef9f2ceba939ae
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 7 08:59:41 2012 -0400

    core: update to build.

commit 3460598bb8310a1367468ce4394dc9b73f6e9c45
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 7 08:59:04 2012 -0400

    digital: need to look for this import in two places for either installed 
apps or QA code.

commit d68086930cc858d936d847507f6e91d3a9159af3
Author: Tom Rondeau <address@hidden>
Date:   Sat Jul 7 08:58:08 2012 -0400

    digital: fixing up equalizers to work with new inheritance structure.

commit 01b34d220b5077fef0257d455e13a00daf09545d
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 6 19:00:26 2012 -0400

    filter: bug fixes to use components in gr.filter and others fixes.
    
    QA working for all but CMA and LMS equalizers.

commit f19e03a0be243d19f01468f31342455ddd079e6c
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 6 18:59:18 2012 -0400

    digital: fixing build system to allow use of Volk and to use gr.filter

commit 132121f310f3576ece5ee4b66e80653e9e81f41e
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 6 18:25:14 2012 -0400

    digital: updated mpsk_receiver and pfb_clock_sync_{fff,ccf} to use 
gr-filter.

commit ee59ee2864254fc6a6788083fcaae46bea2fa877
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 6 18:10:20 2012 -0400

    digital: updated CPM and GMSK modulators to use blocks out of gr-filter.

commit 491e6b0b94e4973ee9b763f85fabda578fbe7f92
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 6 18:09:08 2012 -0400

    digital: updated equalizers to use new gr::filter::kernel::adaptive_fir_ccc.

commit 5f103b0a99d5f31e0dc55693242b887b8186eac3
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 6 18:08:19 2012 -0400

    filter: added kernel for adaptive fir filter.
    
    Note: still need to update the blocks to use this new kernel.

commit ce1fae5a817bc9dca0fbc4de5b9e25dedfed4f1e
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 6 18:05:20 2012 -0400

    digital: Updated build system to look for gr-filter stuff.

commit f3c3ce7880ab1ccd845925d85bd2699048ac220d
Merge: b85363c af0be8a
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 5 22:03:30 2012 -0400

    Merge branch 'wip/filter-rm-next' of 
vortex.corganenterprises.com:gnuradio-trondeau into wip/filter-rm-next

commit 6926bfd62e0067b6c797d3a1dc4e9f8d3ba7f9ae
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 5 22:02:07 2012 -0400

    qtgui: wip: adding form around static plot tools to adjust start and end 
num samples.

commit 9aabbe0601919c9fecd46e4e418e5c94183fca45
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 5 22:01:45 2012 -0400

    core: adding ability to change and reset skiphead parameters.

commit efa0fc2b4071949939db75454f2464174f701445
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 5 22:01:16 2012 -0400

    qtgui: bug fixes to time plots.

commit d195cf6b8770434086cd8bd8b12c844bac4a5193
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 5 22:00:49 2012 -0400

    qtgui: added setting/resetting of FFT size for waterfall plots.

commit 29ac0eef69555444f74b3809d4e955891a01bd00
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 5 21:59:11 2012 -0400

    qtgui: added setting/resetting of FFT size and averaging.

commit 9b04478e07a418fd1a4d0a3408c10826f5c7f0bb
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 4 20:57:11 2012 -0400

    qtgui: added freq sink specific menu item to adjust the fft size.

commit f77280354e7bf7919e6ea0c530a1ea99749f8901
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 4 20:56:54 2012 -0400

    qtgui: added spectrogram static plot and updated others.

commit dde878ff02cd1a9246b348b19d1b9b7aabcbee27
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 4 20:56:16 2012 -0400

    qtgui: added block tree file for qtgui to better organize blocks.

commit cf8fbed51d45c28f7079e8796819f5cd4f889979
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 4 20:55:47 2012 -0400

    qtgui: adding stand-alone waterfall form/plots.

commit af0be8a9fb67820e5808cd01d102afeae24a5729
Merge: 37cb2a3 107b131
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jul 3 18:12:22 2012 -0700

    Merge branch 'next' into wip/filter-rm-next
    
    Conflicts:
        gnuradio-core/src/lib/swig/CMakeLists.txt

commit 107b131a1497451efa02b9274c22f3369ff10be0
Merge: 342a400 dbc7a4c
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jul 3 17:43:22 2012 -0700

    Merge branch 'master' into next

commit bf665eeb45e6816202e146eeff059a1ac81b73e2
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 3 20:35:28 2012 -0400

    qtgui: using volk to handle conversion/decomposing float/complex to double 
buffers.
    
    Adding an unaligned 32fc_deinterleave_64f_x2 volk kernel to support this.

commit 1b6152005ca48614942bb8260d340c3dba039c11
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 3 19:55:34 2012 -0400

    fft: adding a malloc for doubles.
    
    In core for master, also exporting symbols for use externally.

commit d25aca5436ca7d08a7cfd5f9758710e1854bf087
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 3 19:31:03 2012 -0400

    qtgui: adding PSD and constellation static plot tools.

commit d97fb837b0a478d912dccdc0f4891faf1d541a5c
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 3 19:27:09 2012 -0400

    qtgui: adding a stand-alone constellation plot form with menus.

commit 342a400b754f3ccd306938f83ccfcb285411ba18
Merge: e9c3322 f8581fb
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jul 1 16:26:57 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/CMakeLists.txt

commit 37cb2a313d6d888c3aba222f19cf0e5cda0768e7
Merge: 8c5a09b e9c3322
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jul 1 08:21:35 2012 -0700

    Merge branch 'next' into wip/filter-rm-next

commit 8c5a09be11f8fd26db6f3974d5911b2bb3e82717
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jul 1 08:08:19 2012 -0700

    fcd: update to use new gr-filter blocks

commit e9c33226844aa517503571ce79f6724287580f48
Merge: 9ffa064 7380043
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 29 18:41:18 2012 -0700

    Merge branch 'master' into next

commit 9ffa064af888d656b6ef3ac562afd62c09929555
Merge: ee83ed2 0905a49
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 29 10:53:02 2012 -0700

    Merge branch 'master' into next

commit 86c2c18e107e7e9909a2dee88586b96463fd798c
Author: Tom Rondeau <address@hidden>
Date:   Fri Jun 29 10:26:08 2012 -0400

    qtgui: added qtgui_freq sink for reals and GRC files for freq sinks.

commit 68e4c1b8b58126ea8676540b2c7b0bdf2e36fd9e
Author: Tom Rondeau <address@hidden>
Date:   Fri Jun 29 08:05:16 2012 -0400

    qtgui: made display form and display plot base classes to handle duplicated 
functions.
    
    Forms and plots for each type of graph inherit from here now to make things 
cleaner.

commit bc77a2f13c4517459f4759bd2d95c7744282264a
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 28 00:54:13 2012 -0400

    qtgui: adding ability to start/stop running time plots.

commit be0c66690661eb5147b77892caecf89ed5444b90
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 27 00:14:41 2012 -0400

    qtgui: added ability to set line style and add markers.

commit ee83ed280d713ed400c62518ceea5b88943000f9
Merge: 8810102 feaa399
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 25 18:49:46 2012 -0700

    Merge branch 'master' into next

commit d5bfde97b3412b1ffaa87846fb69f210bb7d351a
Author: Tom Rondeau <address@hidden>
Date:   Mon Jun 25 21:11:12 2012 -0400

    qtgui: stand-alone FFT plot can handle multiple signals.

commit ec215b56ae714b8d9342e7b9ded599b07c9da619
Author: Tom Rondeau <address@hidden>
Date:   Mon Jun 25 20:10:27 2012 -0400

    qtgui: adding a stand-alone frequency domain plot form.

commit 94c940aa53e5908dd51a37e0a2bc930cd3173e65
Author: Tom Rondeau <address@hidden>
Date:   Mon Jun 25 18:17:38 2012 -0400

    qtgui: added ability to set width and label of curves in time plots.
    
    Also moved all menu classes to a form_menus.h to make them more easily 
accessible by other forms.

commit 1f57cf3fee8ded4d58e77bef8ffd8d8ce4aca53c
Merge: fd3abfe 8810102
Author: Ben Reynwar <address@hidden>
Date:   Mon Jun 25 08:09:05 2012 -0700

    Merge branch 'next' of http://gnuradio.org/git/gnuradio into next

commit 53ef7dc95ba23d2e1e086c3004c02bc75542a849
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 24 18:17:35 2012 -0400

    qtgui: adding ability to set line width's from time display form.

commit e587c32fe4994f81d5a69a90ee450e914f16660f
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 24 18:03:52 2012 -0400

    qtgui: creating an app to read from and display a file of complex floats.
    
    This only displays the signal in time. Can specify multiple files to read 
from.

commit 1d41b8f1341452908e5bc61a6a41a6baa1f353d6
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 24 18:02:21 2012 -0400

    qtgui: Adding menu feature to timedisplayform.
    
    Right now, right clicking outside of plot window brings up a menu to turn 
grid on/off and to set the line color for all curves in the figure.

commit d97764ce6040aff8023b43323b4bc048a907a1fd
Merge: b142f64 bf8700a
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 24 16:06:38 2012 -0400

    Merge branch 'master' into my_qtsink
    
    Conflicts:
        gr-qtgui/include/qtgui_sink_c.h
        gr-qtgui/include/qtgui_sink_f.h
        gr-qtgui/include/qtgui_util.h
        gr-qtgui/lib/ConstellationDisplayPlot.cc
        gr-qtgui/lib/FrequencyDisplayPlot.cc
        gr-qtgui/lib/SpectrumGUIClass.cc
        gr-qtgui/lib/TimeDomainDisplayPlot.cc
        gr-qtgui/lib/WaterfallDisplayPlot.cc
        gr-qtgui/lib/qtgui_sink_c.cc
        gr-qtgui/lib/qtgui_sink_f.cc
        gr-qtgui/lib/spectrumdisplayform.cc

commit b85363c45d3ee282c80d11cdfd4179db34f001f1
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jun 24 08:46:11 2012 -0700

    core: wip, squash, fixed digital_clock_recovery_xx to use gr-filter

commit e440594df6d947800f4a70b74b0af8e77bb649b5
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jun 24 08:44:49 2012 -0700

    core: fix missing update from dc172e5d

commit 16a097cc75bf62c85ae15c75a1e44dbe219b1a1c
Merge: dc172e5 8810102
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 23 20:07:13 2012 -0700

    Merge branch 'next' into wip/filter-rm-next

commit dc172e5dc3f42143a5de6c43bf4f9118c273986b
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 23 19:41:40 2012 -0700

    core: wip, first pass to remove filter/hier blocks after migration to 
gr-filter
    
    * This commit removes all the blocks from src/lib/filter and src/lib/hier,
    but leaves a couple stray files in src/lib/filter that won't be removed
    until gr-analog is done
    
    * The relevant QA code has been removed and the gnuradio-core directory
    passes QA
    
    * The effect on Python files in src/python/* has not been fully accounted
    for
    
    * Several top-level components outside gnuradio-core use header files,
    blocks, or utility functions that have moved to gr-digital.  These have
    not been updated yet.
    
    * Similarly, impact on python example files in other components as not
    yet been accounted for.

commit 881010202a5054c430d8e5a6f72c206c1cc350ae
Merge: c9e9b9f bf8700a
Author: Tom Rondeau <address@hidden>
Date:   Sat Jun 23 09:44:14 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/CMakeLists.txt
        gnuradio-core/src/lib/general/general.i

commit c9e9b9fd54469aac9d2965796971988caba06522
Merge: 32fed6f 82f6a4e
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 22 15:06:28 2012 -0700

    Merge branch 'master' into next

commit 32fed6f96d34b0262fea72ff16293618536a5ca3
Merge: b0f3d0c 056d300
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 22 13:00:45 2012 -0700

    Merge branch 'master' into next

commit b0f3d0cb23cbf77e059bb01047b77a6c89f1e7c9
Merge: 9965c0a 62f7129
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 21 23:04:44 2012 -0400

    Merge branch 'master' into next

commit 9965c0a8d09dc905f7eca2ed05ffdc4a4c7dcc64
Merge: c316e30 52bda3a
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 21 08:29:37 2012 -0400

    Merge branch 'master' into next

commit c316e3088e96bd9623420e2a0399fa772c96ef49
Merge: f0d904d a0ffd48
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 20 16:47:03 2012 -0400

    Merge branch 'master' into next

commit f0d904d345192d9ac52829e3f64d91497616aceb
Merge: de7257e 2294e8c
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 20 12:47:46 2012 -0400

    Merge branch 'master' into next

commit de7257e31c730210732810e1edfce76c77896daa
Merge: 4acc9ca a982dbd
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 20 12:38:00 2012 -0400

    Merge branch 'master' into next

commit 4acc9ca36e4c548f2c5bfa4d27f006497b2c7e8a
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 20 07:55:32 2012 -0700

    digital: fixed old use of gr.map_bb, block is now only in gr-digital

commit c6c16f89f2ffe1a69afb92526a0ce12f80dd6eca
Merge: a8c8c4c 446494e
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 20 07:46:50 2012 -0700

    Merge branch 'master' into next

commit a8c8c4c5eb2acd727d625b333c5f9206e53e448d
Merge: 0ac6eca d4843d2
Author: Tom Rondeau <address@hidden>
Date:   Sat Jun 16 17:45:27 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/grc/digital_dxpsk_demod.xml
        gr-digital/grc/digital_dxpsk_mod.xml

commit 0ac6eca514ee857f3c14d023b4ea92bac068c2db
Merge: 80e282a a855250
Author: Tom Rondeau <address@hidden>
Date:   Sat Jun 16 16:42:47 2012 -0400

    Merge remote-tracking branch 'benreynwar/digital_tidy' into next
    
    Conflicts:
        gr-digital/python/generic_mod_demod.py

commit 80e282adcdcbe3deedd15b0794135855bfbef2a8
Merge: c6c0485 97e91b8
Author: Tom Rondeau <address@hidden>
Date:   Sat Jun 16 16:36:29 2012 -0400

    Merge branch 'master' into next

commit a855250958a35c4ad2bc553e90b1cdec3308e75b
Author: Ben Reynwar <address@hidden>
Date:   Thu Jun 14 09:19:41 2012 -0700

    digital: Fix bugs in grc xml files.

commit c6c048578bdb39793272928fe5735392f1d9e5f0
Merge: b53fadc 4f9f8cf
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 14 08:55:39 2012 -0700

    Merge branch 'master' into next

commit b53fadce47f17df7303a6f8198af07236c660639
Merge: aca5d3a 6120084
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 14 08:30:21 2012 -0700

    Merge branch 'master' into next

commit aca5d3a12e8cbcb7067bb9acd21e473543730741
Merge: 03ece8e 4a1c2f6
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 13 11:07:00 2012 -0400

    Merge branch 'master' into next

commit 03ece8eff366ff5e760df0883ab9b70c92e34d0d
Merge: e482240 a463215
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 11 08:44:46 2012 -0700

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

commit e482240c80f81f88353078f75431d330a1f79809
Merge: 88fee47 1dcdd0a
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 10 22:56:11 2012 -0400

    Merge branch 'master' into next

commit 88fee472f56905fa2a469e516f35cf5d53edb2c5
Merge: 420daf3 0b8a592
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 10 12:53:24 2012 -0400

    Merge branch 'master' into next

commit 420daf351fe6e93b63e2d9e8e7e7bd9c4cd1b8cf
Merge: bf5d433 06b8633
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 9 09:10:56 2012 -0700

    Merge branch 'master' into next

commit bf5d43316a7ed894a522230ac1a071269498cdb6
Merge: 2bc1ce2 494f2fb
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 8 08:58:59 2012 -0700

    Merge branch 'wip/digital-rm-next' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/CMakeLists.txt
        gnuradio-core/src/lib/general/general.i
        grc/blocks/block_tree.xml

commit 494f2fbdb09976871425f5d3819d11a059d85531
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 8 08:45:13 2012 -0700

    core: removed gr_simple_framer after move to gr-digital

commit d516a6c23602c3e9e29e589f78eb0b5a379041d1
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 8 08:29:11 2012 -0700

    core: removed gr_packet_sink after move to gr-digital

commit 843edb3aa9f4c05d8ce769d571e9d6d12096121c
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 8 08:23:37 2012 -0700

    core: remove gr_framer_sink_1 after move to gr-digital

commit 20a0e7b08dd743b48d4837bfa1db63354458edd9
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 8 08:15:19 2012 -0700

    core: remove gr_correlate_access_code_tag_bb after move to gr-digital

commit b6236c16c6660d023469e2a7535ecd3af312c486
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 8 08:03:38 2012 -0700

    core: removed gr_diff_phasor_cc after move to gr-digital

commit 2bc1ce240f1e88027fdb10e3cffeeb2894c3be15
Merge: b5da580 9038efc
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 7 16:56:12 2012 -0400

    Merge branch 'master' into next

commit b5da580c3723157bc88779aec8f5a3021db106a7
Merge: a54ea0a bfd0dfe
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 7 16:43:37 2012 -0400

    Merge branch 'master' into next

commit a54ea0a4d1a7985b984cdd5e6891cca76123390a
Merge: 3543c1e 4f9556d
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 7 15:53:36 2012 -0400

    Merge branch 'master' into next

commit 0c5b464bf8cd97023d8ced153d14229186b23e8e
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 7 09:59:44 2012 -0700

    core: remove gr_diff_encoder and gr_diff_decoder after move to gr-digital

commit 3543c1e41840ed1e6e2efe81d194c69f535ca3d1
Merge: 90f8c17 23bb2d9
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 7 09:23:32 2012 -0700

    Merge branch 'master' into next

commit ddbaaabc927b2ecc18ad84a238fa3235001bc79b
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 6 09:56:22 2012 -0700

    core: removed gr_chunks_to_symbols_XX after move to gr-digital

commit a09f727276fc0b0af979d962c44260ea2fdcd554
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 6 09:00:38 2012 -0700

    core: removed gr_scrambler_bb after move to gr-digital

commit f3ce47cdf15535b69d536122f7dbb3b21e6b5e61
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 6 08:50:48 2012 -0700

    core: removed gr_probe_density_b after moving to gr-digital

commit 54dc70bb661149ca02744a53f2f05cc4e4288848
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 6 08:39:03 2012 -0700

    core: removed gr_map_bb after transition to gr-digital

commit 90f8c175f9bec700ae41904c98bcd1250f506060
Merge: 98e4856 0eeb875
Author: Tom Rondeau <address@hidden>
Date:   Mon Jun 4 20:44:38 2012 -0400

    Merge branch 'master' into next

commit 98e485607dbb2caa35fb02c4834ef7cc345fb2c8
Merge: d1a6ce8 b7e2c8b
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 2 06:09:53 2012 -0700

    Merge branch 'master' into next

commit d1a6ce8e528b59855cd238296d772d8a1f174739
Merge: b555fec 8569580
Author: Johnathan Corgan <address@hidden>
Date:   Thu May 31 17:07:10 2012 -0700

    Merge branch 'master' into next

commit b555fec24904c50a1e1c58588680fa1f27bc6313
Merge: 31a6637 19fed24
Author: Johnathan Corgan <address@hidden>
Date:   Tue May 29 18:49:39 2012 -0700

    Merge branch 'master' into next

commit 31a6637b2d3b3574dfe5ff280d65d8e61d34888b
Merge: fa70d65 52c6484
Author: Tom Rondeau <address@hidden>
Date:   Sun May 27 10:10:46 2012 -0400

    Merge branch 'master' into next

commit fa70d653cd6603986c5cd723181b6162f5bd1325
Merge: fb4a097 4a34f44
Author: Johnathan Corgan <address@hidden>
Date:   Sat May 26 10:20:23 2012 -0700

    Merge branch 'master' into next

commit fb4a097d05f008c1aacba997b59d026dfa7b001b
Merge: 1303a17 598a843
Author: Tom Rondeau <address@hidden>
Date:   Tue May 22 19:16:19 2012 -0400

    Merge branch 'master' into next

commit c27d9d3bac3a870fee9ec8c4289ae65ab4f2decc
Merge: a363894 5581c19
Author: Ben Reynwar <address@hidden>
Date:   Tue May 22 10:23:36 2012 -0700

    Merge branch 'sphinxdocs' into comments

commit 5581c1913b9a77fcde11b4e25a07a06d076487a4
Author: Ben Reynwar <address@hidden>
Date:   Tue May 22 10:22:45 2012 -0700

    wavelet: Move squash_ff comments so that doxyxml captures them.

commit fd3abfe06ef4f574122d2d2a08b716db8c2b776d
Merge: b4558db f684f3c
Author: Ben Reynwar <address@hidden>
Date:   Mon May 21 13:22:41 2012 -0700

    Merge branch 'sphinxdocs' into next

commit 1303a178f62e90cb3e410589739c6f249c769100
Merge: 012143e 5d33373
Author: Tom Rondeau <address@hidden>
Date:   Mon May 21 15:34:30 2012 -0400

    Merge branch 'master' into next

commit a3638941859c8ac2f61dfc81ff1837997d5540eb
Author: Ben Reynwar <address@hidden>
Date:   Mon May 21 11:40:15 2012 -0700

    docs: Adding/editing top-level docstrings.

commit 012143e44d9dcfc0e157ee9bd564653fa19eada9
Merge: b0b1f51 ed838eb
Author: Tom Rondeau <address@hidden>
Date:   Mon May 21 14:36:24 2012 -0400

    Merge branch 'master' into next

commit b0b1f5139a748c5c4fe985feab17e2c0fd05ae11
Merge: b4558db d4fe437
Author: Tom Rondeau <address@hidden>
Date:   Mon May 21 12:51:18 2012 -0400

    Merge branch 'master' into next

commit b4558dbbfdb7c5183ddf9d84b3a91de34da4b808
Merge: 5ec6c80 99f8f19
Author: Johnathan Corgan <address@hidden>
Date:   Tue May 15 22:58:40 2012 -0700

    Merge branch 'master' into next

commit 5ec6c8018d99110eb6877d05db2f718521660b00
Merge: 88d4064 1befbf0
Author: Johnathan Corgan <address@hidden>
Date:   Tue May 15 16:23:56 2012 -0700

    Merge branch 'master' into next

commit 88d4064863298d36e217b0c5f9e3437621bf2811
Merge: cef178d ff3d467
Author: Johnathan Corgan <address@hidden>
Date:   Sat May 12 08:56:13 2012 -0700

    Merge branch 'master' into next

commit cef178d6ce685c4254a385eb3f270eb7e1e361a6
Merge: 04ea62d 23dd54b
Author: Johnathan Corgan <address@hidden>
Date:   Tue May 8 09:07:42 2012 -0700

    Merge branch 'master' into next

commit 04ea62d9f909679000b24ca9344deaefeb96484b
Merge: 7b970b9 231b177
Author: Tom Rondeau <address@hidden>
Date:   Mon May 7 21:26:41 2012 -0400

    Merge branch 'master' into next

commit 265daaec335eeacbfdfdb15d50c4d19f387644d7
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 4 20:04:08 2012 -0700

    core: removed gr_glfsr* and gr_pn_correlator after transition to gr-digital

commit 8723cdcb44c06c14ce7162d219cee93e9a2f3f85
Author: Johnathan Corgan <address@hidden>
Date:   Thu May 3 10:37:27 2012 -0700

    core: removed gr_descrambler_bb after transition to gr-digital

commit 7b970b9b1efa72f6d0505b63b2ef4f86fd51d207
Merge: 2d3caf5 f9f1508
Author: Johnathan Corgan <address@hidden>
Date:   Thu May 3 10:19:08 2012 -0700

    Merge branch 'master' into next

commit 73292e45402f561d07b2d2a09f3bf1901a252590
Author: Johnathan Corgan <address@hidden>
Date:   Thu May 3 10:06:58 2012 -0700

    core: removed gr_bytes_to_syms after transition to gr-digital

commit 5aabd7433a66b9964e066c5406884c246b19f709
Author: Johnathan Corgan <address@hidden>
Date:   Thu May 3 09:51:57 2012 -0700

    core: removed gr_additive_scrambler after transition to gr-digital

commit 2d3caf5247687a108e95682cd6c35ade308a83ab
Merge: ff6a03c f4da804
Author: Tom Rondeau <address@hidden>
Date:   Thu May 3 12:51:07 2012 -0400

    Merge branch 'master' into next

commit ff6a03cbc541299ccc14c2018aa46c8834e51df4
Merge: 4e9b55b 8c14a49
Author: Johnathan Corgan <address@hidden>
Date:   Thu May 3 09:13:37 2012 -0700

    Merge branch 'master' into next

commit 4e9b55b9cb3c234f0d9534a79d131a808eb9e86e
Merge: 1e7068c ed8fbd7
Author: Johnathan Corgan <address@hidden>
Date:   Wed May 2 14:49:47 2012 -0700

    Merge branch 'master' into next

commit 1e7068cb0dbd97186eb2a3a4701df62801adb112
Merge: 89f0add 884c23e
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 30 15:59:11 2012 -0700

    Merge branch 'master' into next

commit f775720a830b100e1ed0286b2f879d13be70ca75
Author: Ben Reynwar <address@hidden>
Date:   Mon Apr 30 09:17:40 2012 -0700

    Fully gray-coding QAM constellations.

commit 89f0add577f89c0cb1c3daea3abfc8167ed67478
Merge: 732bbf9 d7ecbd1
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 30 00:15:53 2012 -0700

    Merge branch 'master' into next

commit 732bbf98e4d909d966032463b784fe024b405d87
Merge: 1360058 370425f
Author: Johnathan Corgan <address@hidden>
Date:   Fri Apr 27 08:58:20 2012 -0700

    Merge branch 'master' into next

commit 098ecb7b0ec93313453edfdfb3d7f2824962fdad
Author: Ben Reynwar <address@hidden>
Date:   Thu Apr 26 23:09:59 2012 -0700

    gr_digital: Added QAM to testing.

commit 42109bab4f5be9958529ac9ed015c15ae3e858c2
Author: Ben Reynwar <address@hidden>
Date:   Thu Apr 26 22:59:30 2012 -0700

    gr-digital: Add non-differential tests to qa_constellation_receiver

commit 084249788afd57ffa5e56e699f25cc0e2d6f5616
Author: Ben Reynwar <address@hidden>
Date:   Thu Apr 26 22:57:05 2012 -0700

    gr-digital: PSK modulation. Gray-coding done by constellation order for 
non-differential modulation.

commit 93940233c63b1e889a502dc0558de2bc03bab414
Author: Ben Reynwar <address@hidden>
Date:   Thu Apr 26 21:41:11 2012 -0700

    gr-digital: API-CHANGE. Tidying bpsk, qpsk and generic_mod_demod.

commit 1360058a8fd034cc05baf5b8c480ff1cf50a9cef
Merge: db8d885 03d6286
Author: Tom Rondeau <address@hidden>
Date:   Tue Apr 24 20:59:56 2012 -0400

    Merge branch 'master' into next

commit db8d885ef30be2fce764b1d8310ff39af2eff00e
Merge: 0492d77 6d1419f
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 23 16:45:43 2012 -0700

    Merge branch 'master' into next

commit 0492d77fee4a311880c302100df695f85726b916
Merge: ccd03fa 0f8503f
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 23 16:16:23 2012 -0700

    Merge branch 'master' into next

commit ccd03facf27c7acb6b9eebe6351c8084824705f8
Merge: e0bfcb9 539e909
Author: Tom Rondeau <address@hidden>
Date:   Mon Apr 23 19:10:21 2012 -0400

    Merge branch 'master' into next

commit e0bfcb955b4564fb93da458fadc0486e593c5975
Merge: 2de858e 4240423
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 23 13:13:36 2012 -0700

    Merge branch 'master' into next

commit 2de858ebbbc28097c01e4a773cba99ba4223f64d
Merge: 6f47272 c02fe1a
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 23 11:05:25 2012 -0700

    Merge branch 'master' into next

commit 6f472727661caee5d05f4b065f23a50a943edb66
Merge: 9d56b9b 62eb052
Author: Tom Rondeau <address@hidden>
Date:   Sun Apr 22 21:02:46 2012 -0400

    Merge branch 'master' into next

commit 9d56b9ba3b006e70f442001b54c66bcdb891a3b4
Author: Johnathan Corgan <address@hidden>
Date:   Fri Apr 13 23:04:06 2012 -0700

    wavelet: transition to namespace C++ API

commit e717c7caeb04047c502f1447b0ea8be3dc4e8579
Merge: 1f1efd7 2c7ea13
Author: Johnathan Corgan <address@hidden>
Date:   Sat Apr 21 13:18:49 2012 -0700

    Merge branch 'master' into next

commit 1f1efd79ddfd6bccd38ffbeba57fd42da509d9b8
Merge: 61d337a 065d379
Author: Johnathan Corgan <address@hidden>
Date:   Sat Apr 21 12:22:00 2012 -0700

    Merge branch 'master' into next
    
    * Use merge strategy -s ours to skip master commit

commit 61d337a8bf2c50648ccd2dc1e1ee1b56f3288f12
Author: Johnathan Corgan <address@hidden>
Date:   Sat Apr 21 12:10:48 2012 -0700

    cmake: upgrade revision to 3.7git

commit b142f64573b8b7b15a94fc9c64e2f26264a5b144
Author: Nick Foster <address@hidden>
Date:   Thu Apr 19 18:27:37 2012 -0700

    qtgui: forgot one line...

commit 0ac6f1244669e7a10280395ef862d46fb5e8089c
Author: Nick Foster <address@hidden>
Date:   Thu Apr 19 18:23:13 2012 -0700

    qtgui: use volk to do 32fc -> (double, double) deinterleave + conversion

commit db89e68b8e5b40e478cfacf73f0f177066c6bfa7
Author: Nick Foster <address@hidden>
Date:   Thu Apr 19 18:11:01 2012 -0700

    qtgui: move fftshift into its own fn

commit 01ac510c107684e952ef7b04dd68fbe9db6f8e41
Author: Nick Foster <address@hidden>
Date:   Thu Apr 19 12:17:20 2012 -0700

    qtgui: replace wheels with sliders. much easier to use, wheels look like 
butt.

commit 10c0ccaee305510fe27cb58e8f6182d618a5c078
Author: Nick Foster <address@hidden>
Date:   Thu Apr 19 11:42:06 2012 -0700

    qtgui: waterfall sink uses relative time rather than absolute timestamps.

commit f967ac194d1644a340d7cd0a58777b35bf6c5962
Author: Nick Foster <address@hidden>
Date:   Wed Apr 18 19:14:26 2012 -0700

    qtgui: fixed dblclick emits, need to set state machine in Qwt 6. if we 
didn't maintain compat we could get rid of the whole class.

commit a9040afbde50e5f342b8d82e9281823dc2564c95
Author: Nick Foster <address@hidden>
Date:   Tue Apr 17 09:20:10 2012 -0700

    qtgui: fix zoomer tracker text callbacks for Qwt 6.

commit a916007324fe7ea6735f360dc554ca728d1ce7d0
Author: Nick Foster <address@hidden>
Date:   Mon Apr 16 23:01:44 2012 -0700

    qtgui: removed redundant data types between freq/waterfall sinks.

commit 94f21dbe65891a90f40e64f943ffe74129ff841b
Author: Nick Foster <address@hidden>
Date:   Mon Apr 16 14:04:10 2012 -0700

    qtgui: GRC template sets tb = None on exit for widget cleanup; waterfall 
plot no longer deletes Widget objects (causes double free).

commit 62096dbdda9dd3e8029cde0a6d5abd3ead5c9c4d
Author: Nick Foster <address@hidden>
Date:   Mon Apr 16 09:14:53 2012 -0700

    qtgui: volkify the _f sink. didn't volkify the windowing as there is no 
32f_x2_multiply_32fc block.

commit 1ac18a41b0afe0689f6d61ab189127072c169f28
Author: Nick Foster <address@hidden>
Date:   Sat Apr 14 19:32:48 2012 -0700

    qtgui: added to GRC template window geometry save/restore. saves to QT 
prefs based on the block ID.
    also reduced widget minimum sizes for better behavior on laptops/small 
screens.
    there is a bug where the freq sink will sometimes not resize on init -- 
suspect there's a race there.

commit 8e083f7a66667178d8d35e75e93ef51e8786ceb0
Author: Nick Foster <address@hidden>
Date:   Sat Apr 14 12:28:18 2012 -0700

    qtgui: make constants for update event types to keep them from being 
hardcoded in multiple locations.
    there's probably a better way to have Qt dynamically assign them.

commit dbeddcf0acc94db58305be73ebe86b48e59b0bc4
Author: Nick Foster <address@hidden>
Date:   Sat Apr 14 09:43:49 2012 -0700

    qtgui: minor rearranging of spectrumdisplayform

commit a8723bf3200901b62f4ffe47c2c06d77ab027d23
Author: Nick Foster <address@hidden>
Date:   Fri Apr 13 15:28:03 2012 -0700

    Move the FFT calculation out of the QtGUI part and into the sink. Volkified 
the _c sink FFT.

commit b7a234f2ab36d91691b3739e7f2bac32b97645fc
Author: Nick Foster <address@hidden>
Date:   Fri Apr 13 12:55:57 2012 -0700

    qtgui: add onclick callbacks to GRC XML, specify a variable and it'll 
update it with the freq when the user doubleclicks on the FFT or waterfall.
    also added update rate to GRC XML, changed FFT range function name to 
something saner.

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


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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]