[Commit-gnuradio] git://gnuradio.org/jblum branch, mergeme/qtgui/grc, created. 4d5096c8b084c5832256dc2cd8bb617ee93d94a4

[git repository hosting]

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/jblum".

The branch, mergeme/qtgui/grc has been created
        at  4d5096c8b084c5832256dc2cd8bb617ee93d94a4 (commit)

- Log -----------------------------------------------------------------
commit 4d5096c8b084c5832256dc2cd8bb617ee93d94a4
Merge: 7df5b10ddcd64309a5c299f662a4cd62a7d175ab 
fcebe220ba4690a4c339daa3d0909aad7776e631
Author: Josh Blum <address@hidden>
Date:   Mon Mar 14 16:57:13 2011 -0700

    Merge branch 'wip/qtgui/grc' into mergeme/qtgui/grc
    
    Conflicts:
        grc/grc_gnuradio/Makefile.am

commit 7df5b10ddcd64309a5c299f662a4cd62a7d175ab
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 14 15:20:19 2011 -0700

    gnuradio-examples: add C++ audio examples using new gr-audio
    
    * gnuradio-examples/C++/audio/dial_tone

commit c16a01e08e7b4fa3a7660fac785d2095053b323e
Merge: 5748eff26f835bffedb41bd5748ccbaefbe1e02f 
e2c5a9ff423aaf2b86faac6bb39a8724fdc2aac8
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 14 10:27:36 2011 -0700

    Merge remote branch 'jblum/wip/gr-audio' into wip/gr-audio
    
    * jblum/wip/gr-audio:
      gr-audio: added README and default config fix

commit 5748eff26f835bffedb41bd5748ccbaefbe1e02f
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 14 10:26:56 2011 -0700

    audio: remove obsoleted individual top-level components

commit e2c5a9ff423aaf2b86faac6bb39a8724fdc2aac8
Author: Josh Blum <address@hidden>
Date:   Mon Mar 14 10:17:02 2011 -0700

    gr-audio: added README and default config fix

commit 2ce363d4e82c2f7b7f83f1a9283c33b9793bac2d
Merge: 07bd878bc30f7ab54afc1e2f0055419388c3c992 
d1f8773301dba43e382a88d1fccb52a6197412c7
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 14 09:41:14 2011 -0700

    Merge remote branch 'jblum/wip/gr-audio' into wip/gr-audio
    
    * jblum/wip/gr-audio:
      audio: high prio for platform specific audio osx
      audio: added windows and osx audio source files
      audio: added config checks for other audios, added jack and port
      audio: make prefs look like old audio, removed old audio.py
      audio: register arches with priorities, ex: prefer alsa over oss
      audio: added oss support to gr-audio
      audio: use conf files to specify default arch
      audio: moved the grc audio blocks into gr-audio dir
      audio: moved alsa support files into subdirectory
      audio: work on swig support, it imports
      audio: work to get alsa support in, lets see if this works before adding 
more
      audio: added audio factory registry and top level includes
      audio: skeleton for gr-audio component

commit d1f8773301dba43e382a88d1fccb52a6197412c7
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 16:29:43 2011 -0800

    audio: high prio for platform specific audio osx

commit 5f4976ea2701d6f3ebe35eef7cc939f98a28ec88
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 16:27:43 2011 -0800

    audio: added windows and osx audio source files

commit ef276a8ba31f920ac469b84466338e8693e43a2e
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 16:10:31 2011 -0800

    audio: added config checks for other audios, added jack and port

commit a83d1cf1518827e8b5398bcecef1c8216808ee7c
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 14:31:44 2011 -0800

    audio: make prefs look like old audio, removed old audio.py

commit 78f735f4174c2a0fe275da41252e227226af5b3b
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 13:39:07 2011 -0800

    audio: register arches with priorities, ex: prefer alsa over oss

commit 8bd65a04463692e6f179a5fc4f23d73782103781
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 12:51:53 2011 -0800

    audio: added oss support to gr-audio

commit 0ac77af7db957f8746282b60d57e04d65f7d9054
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 12:31:28 2011 -0800

    audio: use conf files to specify default arch

commit 0644b009591f4c63ed05a8095a0c54c1501bac71
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 11:44:35 2011 -0800

    audio: moved the grc audio blocks into gr-audio dir

commit 6d1d64ebacc156f4df5401dac427b316dd22265d
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 11:28:09 2011 -0800

    audio: moved alsa support files into subdirectory

commit 4cba8db90fe1412232a4c1a20d834f6ce606baf0
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 11:17:04 2011 -0800

    audio: work on swig support, it imports

commit 24d30ff306a906b21ad724c07a95caed24659887
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 10:29:53 2011 -0800

    audio: work to get alsa support in, lets see if this works before adding 
more

commit 77da72f511647d458b62ffefaa94662b78d7f7d3
Author: Josh Blum <address@hidden>
Date:   Wed Mar 9 00:52:55 2011 -0800

    audio: added audio factory registry and top level includes

commit b9b5318101d596b8f06cf5640ddceb90bdb9235c
Author: Josh Blum <address@hidden>
Date:   Tue Mar 8 23:13:13 2011 -0800

    audio: skeleton for gr-audio component

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


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