1 files changed, 10 insertions, 0 deletions
diff --git a/macros/names b/macros/names
index 3e3fa6e..4099cfa 100644
--- a/macros/names
+++ b/macros/names
@@ -17,6 +17,7 @@ boxcar
 buffer
 butter
 buttord
+cceps
 cconv
 cell2sos
 cheb1ord
@@ -48,6 +49,7 @@ enbw
 eqtflength
 falltime
 fftfilt
+fht
 filternorm
 filtfilt
 filtic
@@ -70,8 +72,14 @@ hann
 helperHarmonicDistortionAmplifier
 hilbert1
 icceps
+<<<<<<< HEAD
 ifht
 ifwht
+=======
+idct1
+idct2
+idst1
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
 iirlp2mb
 impinvar
 impz
@@ -160,6 +168,7 @@ sgolay
 sgolayfilt
 shanwavf
 shiftdata
+sigmoid_train
 slewrate
 sos2cell
 sos2ss
@@ -196,6 +205,7 @@ window
 wkeep
 wrev
 xcorr2
+xcov1
 zerocrossing
 zp2sos
 zplane