modified:   Makefile
	modified:   include/dase.h
	modified:   src/dase_convol.c
	new file:   src/dase_fft_common.c
	new file:   test/textr_s.c
	new file:   test/tfftc.c
	modified:   src/dase_fft_common.c
	new file:   test/tryit.c
	modified:   include/dase.h
	modified:   src/dase_convol.c
	modified:   src/dase_fft_common.c
	modified:   test/tfftc.c
Merge https://github.com/knikulov/dsp

Conflicts:
	dase/Makefile
	dase/include/dase.h
	dase/src/dase_fft_common.c
	dase/test/tfftc.c