Merge branch 'osx_10.6_64_fixes' of http://gnuradio.org/git/michaelld
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Mon, 19 Oct 2009 15:25:35 +0000 (08:25 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Mon, 19 Oct 2009 15:25:35 +0000 (08:25 -0700)
commit36a02055f0951e9f123445e1bd82a6d1eb030ac3
tree889f9c5c3bafd07f7362c84a0b8fc394f4858c69
parent76aa7a496c3d5c2a40b7ff190d42b25e51d0cbc0
parent5d311c58cb66a5132bc5978ef7ccf109ea58f66e
Merge branch 'osx_10.6_64_fixes' of gnuradio.org/git/michaelld

This merge adds support for OSX 10.6 in gr-audio-osx and usrp.

Conflicts:
usrp/host/lib/usrp_prims_libusb0.cc
usrp/host/lib/usrp_prims_libusb0.cc