commit-gnuradio
[Top][All Lists]
Advanced

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

[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5


From: git
Subject: [Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
Date: Mon, 6 Jun 2016 19:46:36 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit 87736f4e58a5603d99d0f9579befdda9d77a1fed
Merge: b6e8bdd 06a7c93
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 6 12:43:49 2016 -0700

    Merge branch 'next' into next-qt5

 CMakeLists.txt                                |    2 -
 cmake/Modules/FindGnuradio.cmake              |    2 -
 docs/sphinx/source/fcd_blocks.rst             |    6 -
 docs/sphinx/source/noaa_blocks.rst            |    8 -
 gnuradio-runtime/python/gnuradio/__init__.py  |    2 -
 gr-fcd/AUTHORS                                |    9 -
 gr-fcd/CMakeLists.txt                         |  134 --
 gr-fcd/doc/CMakeLists.txt                     |   23 -
 gr-fcd/doc/README.fcd                         |   13 -
 gr-fcd/doc/fcd.dox                            |   29 -
 gr-fcd/examples/c++/CMakeLists.txt            |   37 -
 gr-fcd/examples/c++/fcd_nfm_rx.cc             |  115 --
 gr-fcd/examples/grc/CMakeLists.txt            |   26 -
 gr-fcd/examples/grc/fcd_apt_rx.grc            | 1080 ------------
 gr-fcd/examples/grc/fcd_fft.grc               |  564 ------
 gr-fcd/examples/grc/fcd_nfm_rx.grc            | 1399 ---------------
 gr-fcd/gnuradio-fcd.pc.in                     |   11 -
 gr-fcd/grc/CMakeLists.txt                     |   24 -
 gr-fcd/grc/fcd_source_c.xml                   |  117 --
 gr-fcd/include/gnuradio/fcd/CMakeLists.txt    |   28 -
 gr-fcd/include/gnuradio/fcd/api.h             |   33 -
 gr-fcd/include/gnuradio/fcd/source_c.h        |  149 --
 gr-fcd/lib/CMakeLists.txt                     |   96 --
 gr-fcd/lib/fcd/CMakeLists.txt                 |   32 -
 gr-fcd/lib/fcd/COPYRIGHT                      |   23 -
 gr-fcd/lib/fcd/fcd.c                          |  895 ----------
 gr-fcd/lib/fcd/fcd.h                          |   79 -
 gr-fcd/lib/fcd/fcdhidcmd.h                    |  305 ----
 gr-fcd/lib/gnuradio-fcd.rc.in                 |   55 -
 gr-fcd/lib/hid/CMakeLists.txt                 |   39 -
 gr-fcd/lib/hid/COPYRIGHT                      |   25 -
 gr-fcd/lib/hid/hid-libusb.c                   | 1427 ----------------
 gr-fcd/lib/hid/hidapi.h                       |  383 -----
 gr-fcd/lib/hid/hidmac.c                       | 1122 ------------
 gr-fcd/lib/hid/hidwin.c                       |  873 ----------
 gr-fcd/lib/source_c_impl.cc                   |  252 ---
 gr-fcd/lib/source_c_impl.h                    |   55 -
 gr-fcd/python/fcd/CMakeLists.txt              |   47 -
 gr-fcd/python/fcd/__init__.py                 |   33 -
 gr-fcd/python/fcd/qa_fcd.py                   |   38 -
 gr-fcd/python/fcd/run_tests.in                |   10 -
 gr-fcd/swig/CMakeLists.txt                    |   61 -
 gr-fcd/swig/fcd_swig.i                        |   40 -
 gr-noaa/CMakeLists.txt                        |  111 --
 gr-noaa/README                                |   67 -
 gr-noaa/examples/CMakeLists.txt               |   29 -
 gr-noaa/examples/file_rx_hrpt.grc             | 1139 -------------
 gr-noaa/examples/hrpt_decode.grc              |  428 -----
 gr-noaa/examples/hrpt_demod.grc               |  963 -----------
 gr-noaa/examples/usrp_rx_hrpt.grc             | 2267 -------------------------
 gr-noaa/examples/usrp_rx_hrpt_nogui.grc       | 1716 -------------------
 gr-noaa/gnuradio-noaa.pc.in                   |   11 -
 gr-noaa/grc/CMakeLists.txt                    |   26 -
 gr-noaa/grc/noaa_hrpt_decoder.xml             |   25 -
 gr-noaa/grc/noaa_hrpt_deframer.xml            |   16 -
 gr-noaa/grc/noaa_hrpt_pll_cf.xml              |   34 -
 gr-noaa/include/gnuradio/noaa/CMakeLists.txt  |   31 -
 gr-noaa/include/gnuradio/noaa/api.h           |   33 -
 gr-noaa/include/gnuradio/noaa/hrpt.h          |   39 -
 gr-noaa/include/gnuradio/noaa/hrpt_decoder.h  |   51 -
 gr-noaa/include/gnuradio/noaa/hrpt_deframer.h |   51 -
 gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h   |   52 -
 gr-noaa/lib/CMakeLists.txt                    |   92 -
 gr-noaa/lib/gnuradio-noaa.rc.in               |   55 -
 gr-noaa/lib/hrpt_decoder_impl.cc              |  206 ---
 gr-noaa/lib/hrpt_decoder_impl.h               |   75 -
 gr-noaa/lib/hrpt_deframer_impl.cc             |  137 --
 gr-noaa/lib/hrpt_deframer_impl.h              |   58 -
 gr-noaa/lib/hrpt_pll_cf_impl.cc               |   93 -
 gr-noaa/lib/hrpt_pll_cf_impl.h                |   56 -
 gr-noaa/oct/frames-to-png.sh                  |    9 -
 gr-noaa/oct/frames_to_ppm.m                   |   85 -
 gr-noaa/python/noaa/CMakeLists.txt            |   49 -
 gr-noaa/python/noaa/__init__.py               |   34 -
 gr-noaa/python/noaa/qa_noaa.py                |   40 -
 gr-noaa/swig/CMakeLists.txt                   |   56 -
 gr-noaa/swig/noaa_swig.i                      |   42 -
 77 files changed, 17877 deletions(-)




reply via email to

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