summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/libbin6058 -> 6120 bytes
-rw-r--r--macros/names7
-rw-r--r--macros/peak2rms.binbin13896 -> 13896 bytes
3 files changed, 2 insertions, 5 deletions
diff --git a/macros/lib b/macros/lib
index e8e47ac..c79382e 100644
--- a/macros/lib
+++ b/macros/lib
Binary files differ
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
diff --git a/macros/peak2rms.bin b/macros/peak2rms.bin
index 8f6cf06..c005c97 100644
--- a/macros/peak2rms.bin
+++ b/macros/peak2rms.bin
Binary files differ