gruel: conditional linking for pthread
gruel: fix linker assumption made explicit on Ubuntu 12.04
Various fixes for using Python 2.5.
Merge branch 'maint'
Revert "Merge remote branch 'jblum-github/pmt_set_deleter'"
This reverts commit f88b8cf5508d3ba446cb94f800c56d34279cf91e, reversingchanges made to a87ac60f15c2593ececb02ba16ab842c20e760d2.
Revert "Merge branch 'test/fix-pmt-deleter' into maint"
This reverts commit 04e2ebb979942cada74f10ea022342716c6851bf, reversingchanges made to 25d687550a0322ffaf270f25faf2b4a78a97142c.
pmt: fix segfault in deleter
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Merge branch 'master' into next
Conflicts: gr-howto-write-a-block/Makefile.common gr-howto-write-a-block/config/gr_standalone.m4
View revisions
Also available in: Atom