projects / debian / gnuradio / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c1c2965 3a822b9)
Merge remote branch 'bitshark/burx_support' into wip/burx_support
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Fri, 14 May 2010 17:31:19 +0000 (10:31 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Fri, 14 May 2010 17:31:19 +0000 (10:31 -0700)
commit7dba4b4a3cf9b2f0fab397494d84c948a3bf85d1
treef2f277e6447a3ac674b6a619b565423e3034c986tree | snapshot
parentc1c29651e8a13c090228723684d6f693a6ae8c34commit | diff
parent3a822b971ba921ba6741eb94a9db0673950ecdffcommit | diff
Merge remote branch 'bitshark/burx_support' into wip/burx_support

* bitshark/burx_support:
  Once and for all, here is the properly updated Makefile.am for the apps
  Updated db_bitshark_rx.c to the proper version that includes the

Conflicts:
usrp2/firmware/lib/db_bitshark_rx.c
usrp2/firmware/lib/db_bitshark_rx.c diff1 | diff2 | blob | history
Debian packaging of gnuradio