Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'next_blocks' into next | Tom Rondeau | 2012-12-29 | 1 | -2/+2 |
| | | | | | | Conflicts: gr-trellis/CMakeLists.txt gr-trellis/python/CMakeLists.txt | ||||
* | trellis: converted gr-trellis to new style. | Tom Rondeau | 2012-12-29 | 1 | -0/+106 |