summaryrefslogtreecommitdiff
path: root/gr-trellis/grc/CMakeLists.txt
AgeCommit message (Collapse)Author
2011-10-08gr: the CMakeLists.txt took a chill pillJosh Blum
2011-09-05Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum
Conflicts: gr-trellis/src/lib/trellis_permutation.h