diff options
| author | Abhinav Dronamraju | 2017-11-23 14:36:51 +0530 |
|---|---|---|
| committer | Abhinav Dronamraju | 2017-11-23 14:36:51 +0530 |
| commit | 5e5f5ddc2a4980b292279d99710d18e84fc1ce60 (patch) | |
| tree | 89c7e32f3c1ac1d307e1ad0aa06fce894730a3db /macros/names | |
| parent | 35a55338103e265953ea76f2ddb65ad71347c22e (diff) | |
| download | FOSSEE-Signal-Processing-Toolbox-5e5f5ddc2a4980b292279d99710d18e84fc1ce60.tar.gz FOSSEE-Signal-Processing-Toolbox-5e5f5ddc2a4980b292279d99710d18e84fc1ce60.tar.bz2 FOSSEE-Signal-Processing-Toolbox-5e5f5ddc2a4980b292279d99710d18e84fc1ce60.zip | |
modified
Diffstat (limited to 'macros/names')
| -rw-r--r-- | macros/names | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/macros/names b/macros/names index ab09d57..4bd1ddd 100644 --- a/macros/names +++ b/macros/names @@ -84,16 +84,13 @@ helperHarmonicDistortionAmplifier hilbert1 hurst icceps -<<<<<<< HEAD -ifft -ifft2 -======= idct1 idct2 idst1 +ifft +ifft2 ifht ifwht ->>>>>>> 9f6962b19c4a5fa76f7525a72faabb1b754712ad iirlp2mb impinvar impz |