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)
commitf92f8aae6746fa8fad1d6721fe1a8583295b38e1
tree8fdee657599d39662edbc0c04bd559199cdc2fef
parentf108f96074a7699f87d80dbd1a5bbc7c2170d1db
parent4c8cda27d86d400e60358f6ad342827bab9d3fdc
Merge branch 'patches/marcus/gr_and_const'

* patches/marcus/gr_and_const:
  grc: adds gr.and_const to block tree
grc/blocks/Makefile.am
grc/blocks/block_tree.xml