Spin-wave evolution crossing from the ferromagnetic to spin-glass regime of Fe/sub x/Cr/sub 1-x/