modified:   cuda_fft_xspec.cu
Merge branch 'master' of https://github.com/kamenoseiji/PolariS

Conflicts:
	cuda_fft_xspec.cu

	deleted:    cuda_fft_xspec.cu
	deleted:    cuda_fft_xspec.cu.bak
	deleted:    cuda_fft_xspec.cu.bak2
	deleted:    cuda_fft_xspec.cu_x
	modified:   shm_k5data.inc
	cuda_fft_xspec.bakup