projects / debian / gnuradio / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f108f96 4c8cda2)
Merge branch 'patches/marcus/gr_and_const'
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Tue, 22 Jun 2010 13:53:16 +0000 (06:53 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Tue, 22 Jun 2010 13:53:16 +0000 (06:53 -0700)
* patches/marcus/gr_and_const:
  grc: adds gr.and_const to block tree

1  2 
grc/blocks/Makefile.am patch | diff1 | diff2 | blob | history
grc/blocks/block_tree.xml patch | diff1 | diff2 | blob | history

diff --cc grc/blocks/Makefile.am
Simple merge
diff --cc grc/blocks/block_tree.xml
Simple merge
Debian packaging of gnuradio