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.2-762-ga5dcd13
Date: Mon, 7 Jan 2013 16:01:01 +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  a5dcd13eee561f74715ea537ec93dabfcc24039b (commit)
       via  1d72dbaf448cb4a398223835b69b71ae3d2a6c22 (commit)
       via  c03114f9861920b246c36bb7e6b2098dadacd60e (commit)
       via  77884c6bb837464b04031e94007c52e9323b005d (commit)
       via  baaf2b6cf06f464a710c3f36db4c9275dd915d92 (commit)
       via  790d68a15bf1766dbb4a77a97e8b59c061de4694 (commit)
       via  5fe246170d7049bfcd8df3900b75022a32cdc4e5 (commit)
       via  34d34586ff4b42d392eee73612bb460f4c21c797 (commit)
       via  e788c523d4f8de3efd64a64f148ac1bf25ea032d (commit)
       via  053d729bcaa6e88791ae21f4c29f3df631aaab65 (commit)
      from  6ac84d93d4e41a68f9e2885ffc403ed2e0e11a27 (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 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

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

Summary of changes:
 cmake/Modules/GrSetupQt4.cmake             |  156 ++++++++++++++++++++++++++++
 gnuradio-core/CMakeLists.txt               |   17 +---
 gnuradio-core/src/lib/CMakeLists.txt       |   18 ++--
 gnuradio-core/src/lib/swig/CMakeLists.txt  |   13 +--
 gnuradio-core/src/tests/CMakeLists.txt     |   17 ++--
 gr-analog/lib/CMakeLists.txt               |   13 ++-
 gr-analog/swig/CMakeLists.txt              |    2 +
 gr-atsc/src/lib/CMakeLists.txt             |   13 ++-
 gr-audio/CMakeLists.txt                    |    4 +-
 gr-audio/examples/c++/CMakeLists.txt       |   11 ++-
 gr-audio/lib/CMakeLists.txt                |    7 +-
 gr-audio/swig/CMakeLists.txt               |    2 +
 gr-blocks/lib/CMakeLists.txt               |   12 +--
 gr-blocks/swig/CMakeLists.txt              |    4 +-
 gr-channels/lib/CMakeLists.txt             |    6 +-
 gr-channels/swig/CMakeLists.txt            |    6 +-
 gr-comedi/src/CMakeLists.txt               |   16 ++-
 gr-digital/lib/CMakeLists.txt              |   11 +-
 gr-digital/swig/CMakeLists.txt             |    7 +-
 gr-fcd/examples/c++/CMakeLists.txt         |   14 ++-
 gr-fcd/lib/CMakeLists.txt                  |   16 ++-
 gr-fcd/swig/CMakeLists.txt                 |    4 +-
 gr-fec/lib/CMakeLists.txt                  |    3 +-
 gr-fec/swig/CMakeLists.txt                 |    4 +-
 gr-fft/lib/CMakeLists.txt                  |    3 +-
 gr-fft/swig/CMakeLists.txt                 |    2 +
 gr-filter/lib/CMakeLists.txt               |    8 +-
 gr-filter/swig/CMakeLists.txt              |    4 +-
 gr-howto-write-a-block/CMakeLists.txt      |    8 +-
 gr-howto-write-a-block/swig/CMakeLists.txt |    2 +
 gr-noaa/lib/CMakeLists.txt                 |    5 +-
 gr-noaa/swig/CMakeLists.txt                |    2 +
 gr-pager/lib/CMakeLists.txt                |    5 +-
 gr-pager/swig/CMakeLists.txt               |    2 +
 gr-qtgui/CMakeLists.txt                    |    5 +-
 gr-qtgui/lib/CMakeLists.txt                |   28 +++---
 gr-qtgui/swig/CMakeLists.txt               |    5 +-
 gr-shd/CMakeLists.txt                      |    1 -
 gr-shd/lib/CMakeLists.txt                  |   10 +-
 gr-shd/swig/CMakeLists.txt                 |    3 +
 gr-trellis/lib/CMakeLists.txt              |    8 +-
 gr-trellis/swig/CMakeLists.txt             |    3 +
 gr-uhd/CMakeLists.txt                      |    1 -
 gr-uhd/examples/c++/CMakeLists.txt         |   10 +-
 gr-uhd/lib/CMakeLists.txt                  |   16 ++--
 gr-uhd/swig/CMakeLists.txt                 |    5 +-
 gr-video-sdl/lib/CMakeLists.txt            |    7 +-
 gr-video-sdl/swig/CMakeLists.txt           |    5 +-
 gr-vocoder/lib/CMakeLists.txt              |    5 +-
 gr-vocoder/swig/CMakeLists.txt             |    2 +
 gr-wavelet/lib/CMakeLists.txt              |    6 +-
 gr-wavelet/swig/CMakeLists.txt             |    2 +
 gruel/CMakeLists.txt                       |    1 -
 gruel/src/lib/CMakeLists.txt               |    9 +-
 gruel/src/swig/CMakeLists.txt              |    6 +-
 volk/apps/CMakeLists.txt                   |    4 +-
 56 files changed, 400 insertions(+), 159 deletions(-)
 create mode 100644 cmake/Modules/GrSetupQt4.cmake


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



reply via email to

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