Merge branch 'wip/pager' of git@gnuradio.org:jcorgan
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Sat, 12 Dec 2009 17:34:35 +0000 (09:34 -0800)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Sat, 12 Dec 2009 17:34:35 +0000 (09:34 -0800)
commitbdf985aa55ed90394f9015ac7577892dba7e5cae
tree2786e704053f248cace6b61608fece4db21f6541
parent861d2d1b16e708b65087b86e864980415abd123f
parent34c64290e3146b50053494839847e9f894d98493
Merge branch 'wip/pager' of git@gnuradio.org:jcorgan

Merge-fix: Fix erroneous EXTRA_DIST in lib/
Merge-fix: Don't install usrp_rx_flex.py (unfinished)
gr-pager/apps/Makefile.am
gr-pager/lib/Makefile.am