Revert "Merge tag 'v3.21.70' of git://git.berlios.de/fldigi"

This reverts commit 45dc6d3dab80ba0edbdbee68a8c213208677bef4, reversing
changes made to 1a3c8a2693ad849c3d8e93de3e6216a2fd781262.

Conflicts:
	src/dialogs/confdialog.cxx
	src/dialogs/confdialog.fl
	src/throb/throb.cxx
Compiles clean now on OS X (with previous changes included (changing numtones in throb.cxx))