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. 3.6


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.2git-213-g8513c8d
Date: Sat, 7 Jul 2012 22:47:00 +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  8513c8d741f8702462bab1ac5a5ba565793dee54 (commit)
       via  3a142bebafdc018bccc80cf124a375b53db03581 (commit)
      from  107b131a1497451efa02b9274c22f3369ff10be0 (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 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

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

Summary of changes:
 gnuradio-core/CMakeLists.txt                       |    4 +-
 gnuradio-core/src/lib/general/CMakeLists.txt       |    1 -
 gnuradio-core/src/lib/general/general.i            |    3 +-
 gnuradio-core/src/lib/general/gr_block_gateway.cc  |  184 ---------------
 gnuradio-core/src/lib/general/gr_block_gateway.h   |  212 ------------------
 gnuradio-core/src/lib/general/gr_block_gateway.i   |   46 ----
 .../src/python/gnuradio/gr/CMakeLists.txt          |    3 -
 gnuradio-core/src/python/gnuradio/gr/__init__.py   |    3 +-
 gnuradio-core/src/python/gnuradio/gr/gateway.py    |  215 ------------------
 .../src/python/gnuradio/gr/qa_block_gateway.py     |  235 --------------------
 10 files changed, 4 insertions(+), 902 deletions(-)
 delete mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.i
 delete mode 100644 gnuradio-core/src/python/gnuradio/gr/gateway.py
 delete mode 100644 gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py


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



reply via email to

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