commit-gnuradio
[Top][All Lists]
Advanced

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

[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-744-g3c5d1c7
Date: Mon, 4 Mar 2013 15:31:54 +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/gnuradio".

The branch, next has been updated
       via  3c5d1c72471f71484d25002b85061fe7fa543116 (commit)
       via  647e8263d9c03894d3986482af8cec6315c310c7 (commit)
       via  34c7025bc12585b493b71297284f365054d29bd7 (commit)
       via  dea9e149718cf900f509f79abbb4ace2c40d6ce5 (commit)
       via  5fe234f18360b4680a7b9fef1eb710cb7fe37a07 (commit)
       via  4fd16922d4e7ae2e5fd9dd048a873cbef409a7ff (commit)
       via  ce211603ff8821b50f7c9ebc3931498c6f2bd374 (commit)
       via  6121d0b12bcb308586b5888b6c7e82832f692e5c (commit)
       via  9c0f2dea1c3dc661d53f182f4c6b82c713f4de44 (commit)
       via  c9dc582402d2551ead29a60256fdf64a1d43534c (commit)
       via  1300d48af4752037feac4fae7c3c64187cc0a5a8 (commit)
       via  9e299d568123f8df5188d0850311cb7f5b5e11f2 (commit)
       via  a87c609beb6aef9b584c7ff638cdffe7e3637e97 (commit)
       via  e2285793a5a9f5195eb77318452fc2aca95878ec (commit)
       via  d71d02d7eb01b56b842d6a71a2b7d087c5513e7b (commit)
       via  a14010ec147e3c86f93245d34be58548493aaed1 (commit)
       via  f078026e1ac4037e6ec9212c6e8085ef683ab5bc (commit)
       via  7cfe8af854348924d31aa1feb5978da6dd1fe1c4 (commit)
      from  47e6a7a0cdd65136735b2ae89fe86990431d230f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3c5d1c72471f71484d25002b85061fe7fa543116
Merge: 34c7025 647e826
Author: Tom Rondeau <address@hidden>
Date:   Mon Mar 4 09:22:25 2013 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc

commit 34c7025bc12585b493b71297284f365054d29bd7
Author: Tom Rondeau <address@hidden>
Date:   Sun Mar 3 18:09:51 2013 -0500

    Fixing up some code after merge and conflicts.

commit dea9e149718cf900f509f79abbb4ace2c40d6ce5
Merge: 47e6a7a 5fe234f
Author: Tom Rondeau <address@hidden>
Date:   Sun Mar 3 17:39:55 2013 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/CMakeLists.txt
        gnuradio-core/gnuradio-core.conf
        gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc
        gnuradio-core/src/lib/runtime/runtime.i
        gr-atsc/src/lib/CMakeLists.txt
        gr-audio/lib/CMakeLists.txt
        gr-comedi/src/CMakeLists.txt
        gr-digital/lib/CMakeLists.txt
        gr-howto-write-a-block/CMakeLists.txt
        gr-howto-write-a-block/lib/CMakeLists.txt
        gr-noaa/lib/CMakeLists.txt
        gr-qtgui/lib/CMakeLists.txt
        gr-trellis/src/lib/CMakeLists.txt
        gr-uhd/lib/CMakeLists.txt
        gr-video-sdl/src/CMakeLists.txt
        gr-vocoder/lib/CMakeLists.txt
        gr-wavelet/lib/CMakeLists.txt

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

Summary of changes:
 CMakeLists.txt                                     |    3 +
 cmake/Modules/FindLog4cxx.cmake                    |   28 ++
 cmake/Modules/GrMiscUtils.cmake                    |   41 ++
 docs/doxygen/other/extra_pages.dox                 |    2 +
 docs/doxygen/other/logger.dox                      |  202 ++++++++
 docs/doxygen/other/main_page.dox                   |    1 +
 gnuradio-core/CMakeLists.txt                       |   16 +-
 gnuradio-core/gnuradio-core.conf                   |   16 -
 gnuradio-core/gnuradio-core.conf.in                |   34 ++
 gnuradio-core/gr_log_default.xml                   |   64 +++
 gnuradio-core/src/lib/CMakeLists.txt               |   16 +
 gnuradio-core/src/lib/runtime/CMakeLists.txt       |    5 +
 gnuradio-core/src/lib/runtime/gr_block.cc          |   47 ++
 gnuradio-core/src/lib/runtime/gr_block.h           |    6 +
 gnuradio-core/src/lib/runtime/gr_logger.cc         |  189 ++++++++
 gnuradio-core/src/lib/runtime/gr_logger.h          |  498 ++++++++++++++++++++
 gnuradio-core/src/lib/runtime/gr_logger.i          |   96 ++++
 .../src/lib/runtime/qa_gr_logger.cc                |   37 +-
 .../src/lib/runtime/qa_gr_logger.h                 |   36 +-
 gnuradio-core/src/lib/runtime/qa_runtime.cc        |    2 +
 gnuradio-core/src/lib/runtime/runtime.i            |    3 +-
 gnuradio-core/src/lib/swig/CMakeLists.txt          |   12 +-
 gnuradio-core/src/tests/CMakeLists.txt             |    3 +
 gr-atsc/src/lib/CMakeLists.txt                     |    6 +-
 gr-audio/lib/CMakeLists.txt                        |    4 +-
 gr-comedi/lib/CMakeLists.txt                       |    2 +
 gr-digital/lib/CMakeLists.txt                      |    3 +
 gr-fcd/lib/CMakeLists.txt                          |    5 +-
 gr-filter/lib/CMakeLists.txt                       |    6 +-
 gr-filter/lib/fir_filter_XXX_impl.cc.t             |    2 +
 gr-howto-write-a-block/CMakeLists.txt              |    6 +
 .../cmake/Modules/FindLog4cxx.cmake                |   28 ++
 .../cmake/Modules/GrMiscUtils.cmake                |   43 ++
 gr-howto-write-a-block/lib/CMakeLists.txt          |    8 +-
 gr-noaa/lib/CMakeLists.txt                         |    3 +
 gr-pager/lib/CMakeLists.txt                        |    4 +
 gr-qtgui/lib/CMakeLists.txt                        |    3 +
 gr-shd/lib/CMakeLists.txt                          |    4 +
 gr-trellis/lib/CMakeLists.txt                      |    2 +
 gr-uhd/lib/CMakeLists.txt                          |    7 +-
 gr-video-sdl/lib/CMakeLists.txt                    |    2 +
 gr-vocoder/lib/CMakeLists.txt                      |    3 +
 gr-wavelet/lib/CMakeLists.txt                      |    3 +
 43 files changed, 1448 insertions(+), 53 deletions(-)
 create mode 100644 cmake/Modules/FindLog4cxx.cmake
 create mode 100644 docs/doxygen/other/logger.dox
 delete mode 100644 gnuradio-core/gnuradio-core.conf
 create mode 100644 gnuradio-core/gnuradio-core.conf.in
 create mode 100644 gnuradio-core/gr_log_default.xml
 create mode 100644 gnuradio-core/src/lib/runtime/gr_logger.cc
 create mode 100644 gnuradio-core/src/lib/runtime/gr_logger.h
 create mode 100644 gnuradio-core/src/lib/runtime/gr_logger.i
 copy gr-utils/python/modtool/gr-newmod/lib/qa_howto.cc => 
gnuradio-core/src/lib/runtime/qa_gr_logger.cc (57%)
 copy gr-analog/lib/qa_analog.h => gnuradio-core/src/lib/runtime/qa_gr_logger.h 
(55%)
 create mode 100644 gr-howto-write-a-block/cmake/Modules/FindLog4cxx.cmake


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



reply via email to

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