Merge and solve ifft2 conflict

1 files changed, 36 insertions, 1 deletions

diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml
index b84b3cd..f3c806f 100644
--- a/help/en_US/scilab_en_US_help/jhelptoc.xml
+++ b/help/en_US/scilab_en_US_help/jhelptoc.xml
@@ -2,20 +2,25 @@
 <!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">
 <toc version="1.0">
 <tocitem target="index" text="FOSSEE Signal Processing Toolbox">
-<tocitem target="section_234c65355e471cd38bd717d720add7db" text="FOSSEE Signal Processing Toolbox">
+<tocitem target="section_cc2bc01c47967d47fcf3507a91d572ba" text="FOSSEE Signal Processing Toolbox">
 <tocitem target="ac2poly" text="ac2poly"/>
 <tocitem target="ac2rc" text="ac2rc"/>
 <tocitem target="arParEst" text="arParEst"/>
+<tocitem target="ar_psd" text="ar_psd"/>
 <tocitem target="arburg" text="arburg"/>
 <tocitem target="arch_rnd" text="arch_rnd"/>
+<tocitem target="arch_test" text="arch_test"/>
+<tocitem target="arch_fit" text="arch_fit"/>
 <tocitem target="arcov" text="arcov"/>
 <tocitem target="arma_rnd" text="arma_rnd"/>
 <tocitem target="armcov" text="armcov"/>
 <tocitem target="aryule" text="aryule"/>
+<tocitem target="autoreg_matrix" text="autoreg_matrix"/>
 <tocitem target="barthannwin" text="barthannwin"/>
 <tocitem target="bartlett" text="bartlett"/>
 <tocitem target="besselap" text="besselap"/>
 <tocitem target="besself" text="besself"/>
+<tocitem target="bilinear" text="bilinear"/>
 <tocitem target="bitrevorder" text="bitrevorder"/>
 <tocitem target="blackman" text="blackman"/>
 <tocitem target="blackmanharris" text="blackmanharris"/>
@@ -42,9 +47,11 @@
 <tocitem target="cl2bp" text="cl2bp"/>
 <tocitem target="clustersegment" text="clustersegment"/>
 <tocitem target="cmorwavf" text="cmorwavf"/>
+<tocitem target="cohere" text="cohere"/>
 <tocitem target="convmtx" text="convmtx"/>
 <tocitem target="corrmtx" text="corrmtx"/>
 <tocitem target="cplxreal" text="cplxreal"/>
+<tocitem target="cpsd" text="cpsd"/>
 <tocitem target="cummax" text="cummax"/>
 <tocitem target="cummin" text="cummin"/>
 <tocitem target="czt" text="czt"/>
@@ -52,11 +59,15 @@
 <tocitem target="db2pow" text="db2pow"/>
 <tocitem target="dctmtx" text="dctmtx"/>
 <tocitem target="decimate" text="decimate"/>
+<tocitem target="detrend1" text="detrend1"/>
 <tocitem target="dftmtx" text="dftmtx"/>
+<tocitem target="diffpara" text="diffpara"/>
 <tocitem target="diric" text="diric"/>
 <tocitem target="downsample" text="downsample"/>
 <tocitem target="dst1" text="dst1"/>
+<tocitem target="durbinlevinson" text="durbinlevinson"/>
 <tocitem target="dutycycle" text="dutycycle"/>
+<tocitem target="dwt" text="dwt"/>
 <tocitem target="ellip" text="ellip"/>
 <tocitem target="ellipap" text="ellipap"/>
 <tocitem target="ellipord" text="ellipord"/>
@@ -65,18 +76,30 @@
 <tocitem target="falltime" text="falltime"/>
 <tocitem target="fft1" text="fft1"/>
 <tocitem target="fft21" text="fft21"/>
+<tocitem target="fftconv" text="fftconv"/>
 <tocitem target="fftfilt" text="fftfilt"/>
 <tocitem target="fftw1" text="fftw1"/>
 <tocitem target="fht" text="fht"/>
+<tocitem target="fftshift1" text="fftshift1"/>
+<tocitem target="fftn" text="fftn"/>
+<tocitem target="fht" text="fht"/>
+<tocitem target="filter1" text="filter1"/>
+<tocitem target="filter2" text="filter2"/>
 <tocitem target="filternorm" text="filternorm"/>
 <tocitem target="filtfilt" text="filtfilt"/>
 <tocitem target="filtic" text="filtic"/>
 <tocitem target="filtord" text="filtord"/>
+<tocitem target="findpeaks" text="findpeaks"/>
+<tocitem target="fir1" text="fir1"/>
+<tocitem target="fir2" text="fir2"/>
 <tocitem target="firpmord" text="firpmord"/>
 <tocitem target="firtype" text="firtype"/>
 <tocitem target="flattopwin" text="flattopwin"/>
 <tocitem target="fracshift" text="fracshift"/>
 <tocitem target="freqs" text="freqs"/>
+<tocitem target="fractdiff" text="fractdiff"/>
+<tocitem target="freqs" text="freqs"/>
+<tocitem target="freqz" text="freqz"/>
 <tocitem target="fwhm" text="fwhm"/>
 <tocitem target="fwhmjlt" text="fwhmjlt"/>
 <tocitem target="fwht" text="fwht"/>
@@ -87,7 +110,9 @@
 <tocitem target="gmonopuls" text="gmonopuls"/>
 <tocitem target="goertzel" text="goertzel"/>
 <tocitem target="grpdelay" text="grpdelay"/>
+<tocitem target="hamming" text="hamming"/>
 <tocitem target="hann" text="hann"/>
+<tocitem target="hanning" text="hanning"/>
 <tocitem target="helperHarmonicDistortionAmplifier" text="helperHarmonicDistortionAmplifier"/>
 <tocitem target="hilbert1" text="hilbert1"/>
 <tocitem target="hurst" text="hurst"/>
@@ -99,6 +124,12 @@
 <tocitem target="ifft21" text="ifft21"/>
 <tocitem target="ifht" text="ifht"/>
 <tocitem target="ifwht" text="ifwht"/>
+<tocitem target="ifft" text="ifft"/>
+<tocitem target="ifft2" text="ifft2"/>
+<tocitem target="ifftshift1" text="ifftshift1"/>
+<tocitem target="ifftn" text="ifftn"/>
+<tocitem target="ifht" text="ifht"/>
+<tocitem target="ifwht" text="ifwht"/>
 <tocitem target="iirlp2mb" text="iirlp2mb"/>
 <tocitem target="impinvar" text="impinvar"/>
 <tocitem target="impz" text="impz"/>
@@ -136,6 +167,7 @@
 <tocitem target="modulate" text="modulate"/>
 <tocitem target="morlet" text="morlet"/>
 <tocitem target="movingrms" text="movingrms"/>
+<tocitem target="mscohere" text="mscohere"/>
 <tocitem target="musicBase" text="musicBase"/>
 <tocitem target="ncauer" text="ncauer"/>
 <tocitem target="nnls" text="nnls"/>
@@ -168,6 +200,7 @@
 <tocitem target="pulsewidth" text="pulsewidth"/>
 <tocitem target="pulstran" text="pulstran"/>
 <tocitem target="pyulear" text="pyulear"/>
+<tocitem target="pwelch" text="pwelch"/>
 <tocitem target="qp_kaiser" text="qp_kaiser"/>
 <tocitem target="rc2ac" text="rc2ac"/>
 <tocitem target="rc2is" text="rc2is"/>
@@ -222,6 +255,7 @@
 <tocitem target="tf2zp" text="tf2zp"/>
 <tocitem target="tf2zpk" text="tf2zpk"/>
 <tocitem target="tfestimate" text="tfestimate"/>
+<tocitem target="tfe" text="tfe"/>
 <tocitem target="transpose" text="transpose"/>
 <tocitem target="trial_iirlp2mb" text="trial_iirlp2mb"/>
 <tocitem target="triang" text="triang"/>
@@ -232,6 +266,7 @@
 <tocitem target="uencode" text="uencode"/>
 <tocitem target="ultrwin" text="ultrwin"/>
 <tocitem target="unshiftdata" text="unshiftdata"/>
+<tocitem target="unwrap2" text="unwrap2"/>
 <tocitem target="upfirdn" text="upfirdn"/>
 <tocitem target="upsample" text="upsample"/>
 <tocitem target="upsamplefill" text="upsamplefill"/>