summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhinav Dronamraju2017-11-09 15:32:55 +0530
committerAbhinav Dronamraju2017-11-09 15:32:55 +0530
commitc54a48768d92ccf0f268b4b3b1a762c154865a02 (patch)
tree69423e5d87bc38ff0a2291b4ca10f0e4a8103743
parent2c5902040b960ccca8d0b51c58c00fc114a09518 (diff)
parent3f916032cc0b2efdeafb838dd10e1141ead2cb27 (diff)
downloadFOSSEE-Signal-Processing-Toolbox-c54a48768d92ccf0f268b4b3b1a762c154865a02.tar.gz
FOSSEE-Signal-Processing-Toolbox-c54a48768d92ccf0f268b4b3b1a762c154865a02.tar.bz2
FOSSEE-Signal-Processing-Toolbox-c54a48768d92ccf0f268b4b3b1a762c154865a02.zip
HTML modified
-rw-r--r--fht.sci16
-rw-r--r--help/en_US/scilab_en_US_help/blackman.html12
-rw-r--r--help/en_US/scilab_en_US_help/blackman_BACKUP_14376.html96
-rw-r--r--help/en_US/scilab_en_US_help/blackman_BASE_14376.html84
-rw-r--r--help/en_US/scilab_en_US_help/blackman_LOCAL_14376.html84
-rw-r--r--help/en_US/scilab_en_US_help/blackman_REMOTE_14376.html84
-rw-r--r--help/en_US/scilab_en_US_help/blackmannuttall.html12
-rw-r--r--help/en_US/scilab_en_US_help/bohmanwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/boxcar.html12
-rw-r--r--help/en_US/scilab_en_US_help/buffer.html12
-rw-r--r--help/en_US/scilab_en_US_help/butter.html12
-rw-r--r--help/en_US/scilab_en_US_help/buttord.html12
-rw-r--r--help/en_US/scilab_en_US_help/cconv.html12
-rw-r--r--help/en_US/scilab_en_US_help/cell2sos.html12
-rw-r--r--help/en_US/scilab_en_US_help/cheb1ord.html12
-rw-r--r--help/en_US/scilab_en_US_help/cheb2ord.html12
-rw-r--r--help/en_US/scilab_en_US_help/chebwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/cheby1.html12
-rw-r--r--help/en_US/scilab_en_US_help/cheby2.html12
-rw-r--r--help/en_US/scilab_en_US_help/check.html12
-rw-r--r--help/en_US/scilab_en_US_help/chirp.html12
-rw-r--r--help/en_US/scilab_en_US_help/clustersegment.html12
-rw-r--r--help/en_US/scilab_en_US_help/cmorwavf.html12
-rw-r--r--help/en_US/scilab_en_US_help/convmtx.html12
-rw-r--r--help/en_US/scilab_en_US_help/corrmtx.html12
-rw-r--r--help/en_US/scilab_en_US_help/cummax.html12
-rw-r--r--help/en_US/scilab_en_US_help/cummin.html12
-rw-r--r--help/en_US/scilab_en_US_help/db.html12
-rw-r--r--help/en_US/scilab_en_US_help/db2pow.html12
-rw-r--r--help/en_US/scilab_en_US_help/dctmtx.html12
-rw-r--r--help/en_US/scilab_en_US_help/decimate.html12
-rw-r--r--help/en_US/scilab_en_US_help/dftmtx.html12
-rw-r--r--help/en_US/scilab_en_US_help/diric.html12
-rw-r--r--help/en_US/scilab_en_US_help/downsample.html12
-rw-r--r--help/en_US/scilab_en_US_help/dutycycle.html12
-rw-r--r--help/en_US/scilab_en_US_help/ellip.html12
-rw-r--r--help/en_US/scilab_en_US_help/ellipord.html12
-rw-r--r--help/en_US/scilab_en_US_help/enbw.html12
-rw-r--r--help/en_US/scilab_en_US_help/eqtflength.html12
-rw-r--r--help/en_US/scilab_en_US_help/falltime.html12
-rw-r--r--help/en_US/scilab_en_US_help/fftfilt.html12
-rw-r--r--help/en_US/scilab_en_US_help/filternorm.html12
-rw-r--r--help/en_US/scilab_en_US_help/filtfilt.html12
-rw-r--r--help/en_US/scilab_en_US_help/filtic.html12
-rw-r--r--help/en_US/scilab_en_US_help/filtord.html12
-rw-r--r--help/en_US/scilab_en_US_help/firpmord.html12
-rw-r--r--help/en_US/scilab_en_US_help/firtype.html12
-rw-r--r--help/en_US/scilab_en_US_help/flattopwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/fracshift.html12
-rw-r--r--help/en_US/scilab_en_US_help/fwhm.html12
-rw-r--r--help/en_US/scilab_en_US_help/fwhmjlt.html12
-rw-r--r--help/en_US/scilab_en_US_help/gauspuls.html12
-rw-r--r--help/en_US/scilab_en_US_help/gaussdesign.html12
-rw-r--r--help/en_US/scilab_en_US_help/gaussian.html12
-rw-r--r--help/en_US/scilab_en_US_help/gausswin.html12
-rw-r--r--help/en_US/scilab_en_US_help/gmonopuls.html12
-rw-r--r--help/en_US/scilab_en_US_help/goertzel.html12
-rw-r--r--help/en_US/scilab_en_US_help/grpdelay.html12
-rw-r--r--help/en_US/scilab_en_US_help/hann.html12
-rw-r--r--help/en_US/scilab_en_US_help/helperHarmonicDistortionAmplifier.html12
-rw-r--r--help/en_US/scilab_en_US_help/icceps.html12
-rw-r--r--help/en_US/scilab_en_US_help/iirlp2mb.html12
-rw-r--r--help/en_US/scilab_en_US_help/impinvar.html12
-rw-r--r--help/en_US/scilab_en_US_help/impz.html12
-rw-r--r--help/en_US/scilab_en_US_help/impzlength.html12
-rw-r--r--help/en_US/scilab_en_US_help/index.html4
-rw-r--r--help/en_US/scilab_en_US_help/interp.html12
-rw-r--r--help/en_US/scilab_en_US_help/intfilt.html12
-rw-r--r--help/en_US/scilab_en_US_help/invimpinvar.html12
-rw-r--r--help/en_US/scilab_en_US_help/is2rc.html12
-rw-r--r--help/en_US/scilab_en_US_help/isallpass.html12
-rw-r--r--help/en_US/scilab_en_US_help/isfir.html12
-rw-r--r--help/en_US/scilab_en_US_help/islinphase.html12
-rw-r--r--help/en_US/scilab_en_US_help/ismaxphase.html12
-rw-r--r--help/en_US/scilab_en_US_help/isminphase.html12
-rw-r--r--help/en_US/scilab_en_US_help/isstable.html12
-rw-r--r--help/en_US/scilab_en_US_help/jhelpmap.jhm4
-rw-r--r--help/en_US/scilab_en_US_help/jhelptoc.xml4
-rw-r--r--help/en_US/scilab_en_US_help/kaiser.html12
-rw-r--r--help/en_US/scilab_en_US_help/lar2rc.html12
-rw-r--r--help/en_US/scilab_en_US_help/latc2tf.html12
-rw-r--r--help/en_US/scilab_en_US_help/latcfilt.html12
-rw-r--r--help/en_US/scilab_en_US_help/latcfilt1.html12
-rw-r--r--help/en_US/scilab_en_US_help/levdown.html12
-rw-r--r--help/en_US/scilab_en_US_help/levin.html12
-rw-r--r--help/en_US/scilab_en_US_help/levinson.html12
-rw-r--r--help/en_US/scilab_en_US_help/lpc.html12
-rw-r--r--help/en_US/scilab_en_US_help/lsf2poly.html12
-rw-r--r--help/en_US/scilab_en_US_help/mag2db.html12
-rw-r--r--help/en_US/scilab_en_US_help/marcumq.html12
-rw-r--r--help/en_US/scilab_en_US_help/medfilt1.html12
-rw-r--r--help/en_US/scilab_en_US_help/mexihat.html12
-rw-r--r--help/en_US/scilab_en_US_help/meyeraux.html12
-rw-r--r--help/en_US/scilab_en_US_help/midcross.html12
-rw-r--r--help/en_US/scilab_en_US_help/modulate.html12
-rw-r--r--help/en_US/scilab_en_US_help/morlet.html12
-rw-r--r--help/en_US/scilab_en_US_help/movingrms.html12
-rw-r--r--help/en_US/scilab_en_US_help/musicBase.html12
-rw-r--r--help/en_US/scilab_en_US_help/nnls.html12
-rw-r--r--help/en_US/scilab_en_US_help/nuttallwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/parzenwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/pchip.html12
-rw-r--r--help/en_US/scilab_en_US_help/pchips.html12
-rw-r--r--help/en_US/scilab_en_US_help/peak2peak.html12
-rw-r--r--help/en_US/scilab_en_US_help/peak2rms.html12
-rw-r--r--help/en_US/scilab_en_US_help/peig.html12
-rw-r--r--help/en_US/scilab_en_US_help/periodogram.html12
-rw-r--r--help/en_US/scilab_en_US_help/phaseInputParseAs_ab.html12
-rw-r--r--help/en_US/scilab_en_US_help/phaseInputParseAs_sos.html12
-rw-r--r--help/en_US/scilab_en_US_help/phasedelay.html12
-rw-r--r--help/en_US/scilab_en_US_help/phasez.html12
-rw-r--r--help/en_US/scilab_en_US_help/pmusic.html12
-rw-r--r--help/en_US/scilab_en_US_help/poly2ac.html12
-rw-r--r--help/en_US/scilab_en_US_help/poly2lsf.html12
-rw-r--r--help/en_US/scilab_en_US_help/poly2rc.html12
-rw-r--r--help/en_US/scilab_en_US_help/polyscale.html12
-rw-r--r--help/en_US/scilab_en_US_help/polystab.html12
-rw-r--r--help/en_US/scilab_en_US_help/polyval.html12
-rw-r--r--help/en_US/scilab_en_US_help/pow2db.html12
-rw-r--r--help/en_US/scilab_en_US_help/primitive.html12
-rw-r--r--help/en_US/scilab_en_US_help/prony.html12
-rw-r--r--help/en_US/scilab_en_US_help/pulseperiod.html12
-rw-r--r--help/en_US/scilab_en_US_help/pulsesep.html12
-rw-r--r--help/en_US/scilab_en_US_help/pulsewidth.html12
-rw-r--r--help/en_US/scilab_en_US_help/pulstran.html12
-rw-r--r--help/en_US/scilab_en_US_help/rc2ac.html12
-rw-r--r--help/en_US/scilab_en_US_help/rc2is.html12
-rw-r--r--help/en_US/scilab_en_US_help/rc2lar.html12
-rw-r--r--help/en_US/scilab_en_US_help/rc2poly.html12
-rw-r--r--help/en_US/scilab_en_US_help/rcosdesign.html12
-rw-r--r--help/en_US/scilab_en_US_help/rectpuls.html12
-rw-r--r--help/en_US/scilab_en_US_help/rectwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/resample.html12
-rw-r--r--help/en_US/scilab_en_US_help/residued.html12
-rw-r--r--help/en_US/scilab_en_US_help/residuez.html12
-rw-r--r--help/en_US/scilab_en_US_help/risetime.html12
-rw-r--r--help/en_US/scilab_en_US_help/rlevinson.html12
-rw-r--r--help/en_US/scilab_en_US_help/rms.html12
-rw-r--r--help/en_US/scilab_en_US_help/rooteig.html12
-rw-r--r--help/en_US/scilab_en_US_help/rootmusic.html12
-rw-r--r--help/en_US/scilab_en_US_help/rssq.html12
-rw-r--r--help/en_US/scilab_en_US_help/sampled2continuous.html12
-rw-r--r--help/en_US/scilab_en_US_help/sawtooth.html12
-rw-r--r--help/en_US/scilab_en_US_help/schtrig.html12
-rw-r--r--help/en_US/scilab_en_US_help/schurrc.html12
-rw-r--r--help/en_US/scilab_en_US_help/section_cc2bc01c47967d47fcf3507a91d572ba.html1207
-rw-r--r--help/en_US/scilab_en_US_help/seqperiod.html12
-rw-r--r--help/en_US/scilab_en_US_help/sgolay.html12
-rw-r--r--help/en_US/scilab_en_US_help/sgolayfilt.html12
-rw-r--r--help/en_US/scilab_en_US_help/shanwavf.html12
-rw-r--r--help/en_US/scilab_en_US_help/shiftdata.html12
-rw-r--r--help/en_US/scilab_en_US_help/slewrate.html12
-rw-r--r--help/en_US/scilab_en_US_help/sos2cell.html12
-rw-r--r--help/en_US/scilab_en_US_help/sos2ss.html12
-rw-r--r--help/en_US/scilab_en_US_help/sos2tf.html12
-rw-r--r--help/en_US/scilab_en_US_help/sos2zp.html12
-rw-r--r--help/en_US/scilab_en_US_help/sosbreak.html12
-rw-r--r--help/en_US/scilab_en_US_help/sosfilt.html12
-rw-r--r--help/en_US/scilab_en_US_help/specgram.html12
-rw-r--r--help/en_US/scilab_en_US_help/ss2sos.html12
-rw-r--r--help/en_US/scilab_en_US_help/statelevels.html12
-rw-r--r--help/en_US/scilab_en_US_help/stmcb.html12
-rw-r--r--help/en_US/scilab_en_US_help/strips.html12
-rw-r--r--help/en_US/scilab_en_US_help/subspaceMethodsInputParser.html12
-rw-r--r--help/en_US/scilab_en_US_help/tf2sos.html12
-rw-r--r--help/en_US/scilab_en_US_help/tf2zp.html12
-rw-r--r--help/en_US/scilab_en_US_help/tf2zpk.html12
-rw-r--r--help/en_US/scilab_en_US_help/transpose.html12
-rw-r--r--help/en_US/scilab_en_US_help/trial_iirlp2mb.html12
-rw-r--r--help/en_US/scilab_en_US_help/triang.html12
-rw-r--r--help/en_US/scilab_en_US_help/tripuls.html12
-rw-r--r--help/en_US/scilab_en_US_help/truth.html12
-rw-r--r--help/en_US/scilab_en_US_help/tukeywin.html12
-rw-r--r--help/en_US/scilab_en_US_help/udecode.html12
-rw-r--r--help/en_US/scilab_en_US_help/uencode.html12
-rw-r--r--help/en_US/scilab_en_US_help/ultrwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/unshiftdata.html12
-rw-r--r--help/en_US/scilab_en_US_help/upfirdn.html12
-rw-r--r--help/en_US/scilab_en_US_help/upsample.html12
-rw-r--r--help/en_US/scilab_en_US_help/upsamplefill.html12
-rw-r--r--help/en_US/scilab_en_US_help/var.html12
-rw-r--r--help/en_US/scilab_en_US_help/vco.html12
-rw-r--r--help/en_US/scilab_en_US_help/welchwin.html12
-rw-r--r--help/en_US/scilab_en_US_help/window.html12
-rw-r--r--help/en_US/scilab_en_US_help/wkeep.html12
-rw-r--r--help/en_US/scilab_en_US_help/wrev.html12
-rw-r--r--help/en_US/scilab_en_US_help/xcorr2.html12
-rw-r--r--help/en_US/scilab_en_US_help/zerocrossing.html12
-rw-r--r--help/en_US/scilab_en_US_help/zp2sos.html12
-rw-r--r--help/en_US/scilab_en_US_help/zplane.html12
-rw-r--r--macros/cceps.binbin0 -> 1332 bytes
-rw-r--r--macros/cceps.sci16
-rw-r--r--macros/fht.binbin0 -> 1584 bytes
-rw-r--r--macros/fht.sci16
-rw-r--r--macros/idct1.binbin0 -> 1308 bytes
-rw-r--r--macros/idct1.sci14
-rw-r--r--macros/idct2.binbin0 -> 1676 bytes
-rw-r--r--macros/idct2.sci15
-rw-r--r--macros/idst1.binbin0 -> 1340 bytes
-rw-r--r--macros/idst1.sci14
-rw-r--r--macros/names10
-rw-r--r--macros/sigmoid_train.binbin0 -> 1208 bytes
-rw-r--r--macros/sigmoid_train.sci12
-rw-r--r--macros/xcov1.binbin0 -> 1708 bytes
-rw-r--r--macros/xcov1.sci17
205 files changed, 3869 insertions, 0 deletions
diff --git a/fht.sci b/fht.sci
new file mode 100644
index 0000000..c6fd1bd
--- /dev/null
+++ b/fht.sci
@@ -0,0 +1,16 @@
+function y=fht(d,n,dim)
+funcprot(0);
+rhs=argn(2);
+if(rhs<1 | rhs>3)
+ error("Wrong number of input arguments.")
+end
+select(rhs)
+case 1 then
+ y=callOctave("fht",d)
+case 2 then
+ y=callOctave("fht",d,n)
+case 3 then
+ y=callOctave("fht",d,n,dim)
+end
+
+endfunction
diff --git a/help/en_US/scilab_en_US_help/blackman.html b/help/en_US/scilab_en_US_help/blackman.html
index 1ebe9ff..0364d8e 100644
--- a/help/en_US/scilab_en_US_help/blackman.html
+++ b/help/en_US/scilab_en_US_help/blackman.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; blackman</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; blackman</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">blackman</h1>
@@ -70,7 +78,11 @@ References
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/blackman_BACKUP_14376.html b/help/en_US/scilab_en_US_help/blackman_BACKUP_14376.html
new file mode 100644
index 0000000..0364d8e
--- /dev/null
+++ b/help/en_US/scilab_en_US_help/blackman_BACKUP_14376.html
@@ -0,0 +1,96 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>blackman</title>
+ <style type="text/css" media="all">
+ @import url("scilab_code.css");
+ @import url("xml_code.css");
+ @import url("c_code.css");
+ @import url("style.css");
+ </style>
+ </head>
+ <body>
+ <div class="manualnavbar">
+ <table width="100%"><tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+<<<<<<< HEAD
+ <span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+
+
+
+<<<<<<< HEAD
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; blackman</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; blackman</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
+
+ <br /><br />
+ <div class="refnamediv"><h1 class="refname">blackman</h1>
+ <p class="refpurpose">Generates a Blackman window</p></div>
+
+
+<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3>
+ <div class="synopsis"><pre><span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">)</span>
+<span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">,</span><span class="default">sflag</span><span class="default">)</span></pre></div></div>
+
+<div class="refsection"><h3 class="title">Parameters</h3>
+ <dl></dl></div>
+
+<div class="refsection"><h3 class="title">Description</h3>
+ <p class="para">w=blackman(N) returns an N-point symmetric Blackman window in a column vector w
+w=blackman(N,sflag)
+Returns an N point Blackman window using the type of sampling specified by sflag
+sflag can be either &#0039;symmetric&#0039; (default) or &#0039;periodic&#0039; (used in spectral analysis)
+Example
+w=blackman(4)
+w =</p>
+ <p class="para">- 1.388D-17
+0.63
+0.63
+- 1.388D-17
+Author
+Ankur Mallick
+References
+[1] Oppenheim, Alan V., Ronald W. Schafer, and John R. Buck. Discrete-Time Signal Processing. Upper Saddle River, NJ: Prentice Hall, 1999.</p></div>
+ <br />
+
+ <div class="manualnavbar">
+ <table width="100%">
+ <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
+<tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+<<<<<<< HEAD
+ <span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+ </body>
+</html>
diff --git a/help/en_US/scilab_en_US_help/blackman_BASE_14376.html b/help/en_US/scilab_en_US_help/blackman_BASE_14376.html
new file mode 100644
index 0000000..69bb945
--- /dev/null
+++ b/help/en_US/scilab_en_US_help/blackman_BASE_14376.html
@@ -0,0 +1,84 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>blackman</title>
+ <style type="text/css" media="all">
+ @import url("scilab_code.css");
+ @import url("xml_code.css");
+ @import url("c_code.css");
+ @import url("style.css");
+ </style>
+ </head>
+ <body>
+ <div class="manualnavbar">
+ <table width="100%"><tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="section_be19baaac84b122b8ad501d34462f5bf.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+
+
+
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_be19baaac84b122b8ad501d34462f5bf.html">FOSSEE Signal Processing Toolbox</a> &gt; blackman</span>
+
+ <br /><br />
+ <div class="refnamediv"><h1 class="refname">blackman</h1>
+ <p class="refpurpose">Generates a Blackman window</p></div>
+
+
+<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3>
+ <div class="synopsis"><pre><span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">)</span>
+<span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">,</span><span class="default">sflag</span><span class="default">)</span></pre></div></div>
+
+<div class="refsection"><h3 class="title">Parameters</h3>
+ <dl></dl></div>
+
+<div class="refsection"><h3 class="title">Description</h3>
+ <p class="para">w=blackman(N) returns an N-point symmetric Blackman window in a column vector w
+w=blackman(N,sflag)
+Returns an N point Blackman window using the type of sampling specified by sflag
+sflag can be either &#0039;symmetric&#0039; (default) or &#0039;periodic&#0039; (used in spectral analysis)
+Example
+w=blackman(4)
+w =</p>
+ <p class="para">- 1.388D-17
+0.63
+0.63
+- 1.388D-17
+Author
+Ankur Mallick
+References
+[1] Oppenheim, Alan V., Ronald W. Schafer, and John R. Buck. Discrete-Time Signal Processing. Upper Saddle River, NJ: Prentice Hall, 1999.</p></div>
+ <br />
+
+ <div class="manualnavbar">
+ <table width="100%">
+ <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
+<tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="section_be19baaac84b122b8ad501d34462f5bf.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+ </body>
+</html>
diff --git a/help/en_US/scilab_en_US_help/blackman_LOCAL_14376.html b/help/en_US/scilab_en_US_help/blackman_LOCAL_14376.html
new file mode 100644
index 0000000..1ebe9ff
--- /dev/null
+++ b/help/en_US/scilab_en_US_help/blackman_LOCAL_14376.html
@@ -0,0 +1,84 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>blackman</title>
+ <style type="text/css" media="all">
+ @import url("scilab_code.css");
+ @import url("xml_code.css");
+ @import url("c_code.css");
+ @import url("style.css");
+ </style>
+ </head>
+ <body>
+ <div class="manualnavbar">
+ <table width="100%"><tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+
+
+
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; blackman</span>
+
+ <br /><br />
+ <div class="refnamediv"><h1 class="refname">blackman</h1>
+ <p class="refpurpose">Generates a Blackman window</p></div>
+
+
+<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3>
+ <div class="synopsis"><pre><span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">)</span>
+<span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">,</span><span class="default">sflag</span><span class="default">)</span></pre></div></div>
+
+<div class="refsection"><h3 class="title">Parameters</h3>
+ <dl></dl></div>
+
+<div class="refsection"><h3 class="title">Description</h3>
+ <p class="para">w=blackman(N) returns an N-point symmetric Blackman window in a column vector w
+w=blackman(N,sflag)
+Returns an N point Blackman window using the type of sampling specified by sflag
+sflag can be either &#0039;symmetric&#0039; (default) or &#0039;periodic&#0039; (used in spectral analysis)
+Example
+w=blackman(4)
+w =</p>
+ <p class="para">- 1.388D-17
+0.63
+0.63
+- 1.388D-17
+Author
+Ankur Mallick
+References
+[1] Oppenheim, Alan V., Ronald W. Schafer, and John R. Buck. Discrete-Time Signal Processing. Upper Saddle River, NJ: Prentice Hall, 1999.</p></div>
+ <br />
+
+ <div class="manualnavbar">
+ <table width="100%">
+ <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
+<tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+ </body>
+</html>
diff --git a/help/en_US/scilab_en_US_help/blackman_REMOTE_14376.html b/help/en_US/scilab_en_US_help/blackman_REMOTE_14376.html
new file mode 100644
index 0000000..b9cd31a
--- /dev/null
+++ b/help/en_US/scilab_en_US_help/blackman_REMOTE_14376.html
@@ -0,0 +1,84 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>blackman</title>
+ <style type="text/css" media="all">
+ @import url("scilab_code.css");
+ @import url("xml_code.css");
+ @import url("c_code.css");
+ @import url("style.css");
+ </style>
+ </head>
+ <body>
+ <div class="manualnavbar">
+ <table width="100%"><tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+
+
+
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; blackman</span>
+
+ <br /><br />
+ <div class="refnamediv"><h1 class="refname">blackman</h1>
+ <p class="refpurpose">Generates a Blackman window</p></div>
+
+
+<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3>
+ <div class="synopsis"><pre><span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">)</span>
+<span class="default">w</span><span class="default">=</span><span class="functionid">blackman</span><span class="default">(</span><span class="default">N</span><span class="default">,</span><span class="default">sflag</span><span class="default">)</span></pre></div></div>
+
+<div class="refsection"><h3 class="title">Parameters</h3>
+ <dl></dl></div>
+
+<div class="refsection"><h3 class="title">Description</h3>
+ <p class="para">w=blackman(N) returns an N-point symmetric Blackman window in a column vector w
+w=blackman(N,sflag)
+Returns an N point Blackman window using the type of sampling specified by sflag
+sflag can be either &#0039;symmetric&#0039; (default) or &#0039;periodic&#0039; (used in spectral analysis)
+Example
+w=blackman(4)
+w =</p>
+ <p class="para">- 1.388D-17
+0.63
+0.63
+- 1.388D-17
+Author
+Ankur Mallick
+References
+[1] Oppenheim, Alan V., Ronald W. Schafer, and John R. Buck. Discrete-Time Signal Processing. Upper Saddle River, NJ: Prentice Hall, 1999.</p></div>
+ <br />
+
+ <div class="manualnavbar">
+ <table width="100%">
+ <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
+<tr>
+ <td width="30%">
+ <span class="previous"><a href="bitrevorder.html">&lt;&lt; bitrevorder</a></span>
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+ <span class="next"><a href="blackmanharris.html">blackmanharris &gt;&gt;</a></span>
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+ </body>
+</html>
diff --git a/help/en_US/scilab_en_US_help/blackmannuttall.html b/help/en_US/scilab_en_US_help/blackmannuttall.html
index 2618f04..9456bc9 100644
--- a/help/en_US/scilab_en_US_help/blackmannuttall.html
+++ b/help/en_US/scilab_en_US_help/blackmannuttall.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; blackmannuttall</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; blackmannuttall</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">blackmannuttall</h1>
@@ -67,7 +75,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/bohmanwin.html b/help/en_US/scilab_en_US_help/bohmanwin.html
index 36aeed7..24b3d19 100644
--- a/help/en_US/scilab_en_US_help/bohmanwin.html
+++ b/help/en_US/scilab_en_US_help/bohmanwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; bohmanwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; bohmanwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">bohmanwin</h1>
@@ -67,7 +75,11 @@ This function returns the filter coefficients of a Bohman window of length m sup
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/boxcar.html b/help/en_US/scilab_en_US_help/boxcar.html
index 78f0cd6..1e8be2a 100644
--- a/help/en_US/scilab_en_US_help/boxcar.html
+++ b/help/en_US/scilab_en_US_help/boxcar.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; boxcar</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; boxcar</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">boxcar</h1>
@@ -69,7 +77,11 @@ This function returns the filter coefficients of a rectangular window of length
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/buffer.html b/help/en_US/scilab_en_US_help/buffer.html
index 070a34c..5a636ef 100644
--- a/help/en_US/scilab_en_US_help/buffer.html
+++ b/help/en_US/scilab_en_US_help/buffer.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; buffer</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; buffer</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">buffer</h1>
@@ -73,7 +81,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/butter.html b/help/en_US/scilab_en_US_help/butter.html
index 505cce5..1fcf412 100644
--- a/help/en_US/scilab_en_US_help/butter.html
+++ b/help/en_US/scilab_en_US_help/butter.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; butter</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; butter</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">butter</h1>
@@ -78,7 +86,11 @@ The third parameter takes in low or high, default value is low. The cutoff is pi
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/buttord.html b/help/en_US/scilab_en_US_help/buttord.html
index 5f24f58..8b39511 100644
--- a/help/en_US/scilab_en_US_help/buttord.html
+++ b/help/en_US/scilab_en_US_help/buttord.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; buttord</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; buttord</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">buttord</h1>
@@ -77,7 +85,11 @@ If wp is contained within the lower and upper limits of ws, the filter is a band
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cconv.html b/help/en_US/scilab_en_US_help/cconv.html
index 94554f6..f35dc09 100644
--- a/help/en_US/scilab_en_US_help/cconv.html
+++ b/help/en_US/scilab_en_US_help/cconv.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cconv</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cconv</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cconv</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cell2sos.html b/help/en_US/scilab_en_US_help/cell2sos.html
index 0645c68..4b92e9c 100644
--- a/help/en_US/scilab_en_US_help/cell2sos.html
+++ b/help/en_US/scilab_en_US_help/cell2sos.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cell2sos</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cell2sos</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cell2sos</h1>
@@ -86,7 +94,11 @@ Ankur Mallick</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cheb1ord.html b/help/en_US/scilab_en_US_help/cheb1ord.html
index 48163e5..058d6f4 100644
--- a/help/en_US/scilab_en_US_help/cheb1ord.html
+++ b/help/en_US/scilab_en_US_help/cheb1ord.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cheb1ord</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cheb1ord</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cheb1ord</h1>
@@ -74,7 +82,11 @@ If wp is contained within the lower and upper limits of ws, the filter is a band
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cheb2ord.html b/help/en_US/scilab_en_US_help/cheb2ord.html
index 88dbdd9..403e33b 100644
--- a/help/en_US/scilab_en_US_help/cheb2ord.html
+++ b/help/en_US/scilab_en_US_help/cheb2ord.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cheb2ord</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cheb2ord</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cheb2ord</h1>
@@ -74,7 +82,11 @@ If wp is contained within the lower and upper limits of ws, the filter is a band
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/chebwin.html b/help/en_US/scilab_en_US_help/chebwin.html
index 3167426..c368f63 100644
--- a/help/en_US/scilab_en_US_help/chebwin.html
+++ b/help/en_US/scilab_en_US_help/chebwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; chebwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; chebwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">chebwin</h1>
@@ -74,7 +82,11 @@ The second parameter is the stop band attenuation of the Fourier transform in dB
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cheby1.html b/help/en_US/scilab_en_US_help/cheby1.html
index ccc33a1..5d9f528 100644
--- a/help/en_US/scilab_en_US_help/cheby1.html
+++ b/help/en_US/scilab_en_US_help/cheby1.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cheby1</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cheby1</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cheby1</h1>
@@ -81,7 +89,11 @@ The fourth parameter takes in high or low, default value is low. The cutoff is p
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cheby2.html b/help/en_US/scilab_en_US_help/cheby2.html
index 9f99a09..ae80925 100644
--- a/help/en_US/scilab_en_US_help/cheby2.html
+++ b/help/en_US/scilab_en_US_help/cheby2.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cheby2</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cheby2</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cheby2</h1>
@@ -81,7 +89,11 @@ The fourth parameter takes in high or low, default value is low. The cutoff is p
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/check.html b/help/en_US/scilab_en_US_help/check.html
index 4d42782..fb691c9 100644
--- a/help/en_US/scilab_en_US_help/check.html
+++ b/help/en_US/scilab_en_US_help/check.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; check</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; check</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">check</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/chirp.html b/help/en_US/scilab_en_US_help/chirp.html
index ba297a4..c6d8c0b 100644
--- a/help/en_US/scilab_en_US_help/chirp.html
+++ b/help/en_US/scilab_en_US_help/chirp.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; chirp</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; chirp</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">chirp</h1>
@@ -82,7 +90,11 @@ The fifth argument is the form which takes in values &#0034;linear&#0034;, &#003
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/clustersegment.html b/help/en_US/scilab_en_US_help/clustersegment.html
index 0ba2ef0..b81b3ec 100644
--- a/help/en_US/scilab_en_US_help/clustersegment.html
+++ b/help/en_US/scilab_en_US_help/clustersegment.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; clustersegment</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; clustersegment</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">clustersegment</h1>
@@ -67,7 +75,11 @@ The output variable c is a cell array of size 1 by N, where N is the number of r
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cmorwavf.html b/help/en_US/scilab_en_US_help/cmorwavf.html
index 3c80298..f4b3764 100644
--- a/help/en_US/scilab_en_US_help/cmorwavf.html
+++ b/help/en_US/scilab_en_US_help/cmorwavf.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cmorwavf</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cmorwavf</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cmorwavf</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/convmtx.html b/help/en_US/scilab_en_US_help/convmtx.html
index ebeef6d..1314e5b 100644
--- a/help/en_US/scilab_en_US_help/convmtx.html
+++ b/help/en_US/scilab_en_US_help/convmtx.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; convmtx</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; convmtx</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">convmtx</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/corrmtx.html b/help/en_US/scilab_en_US_help/corrmtx.html
index d03d78d..de33119 100644
--- a/help/en_US/scilab_en_US_help/corrmtx.html
+++ b/help/en_US/scilab_en_US_help/corrmtx.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; corrmtx</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; corrmtx</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">corrmtx</h1>
@@ -128,7 +136,11 @@ X_mod= | x*(1).....x*(m+1)|
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cummax.html b/help/en_US/scilab_en_US_help/cummax.html
index abdd33b..1fa8952 100644
--- a/help/en_US/scilab_en_US_help/cummax.html
+++ b/help/en_US/scilab_en_US_help/cummax.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cummax</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cummax</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cummax</h1>
@@ -73,7 +81,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/cummin.html b/help/en_US/scilab_en_US_help/cummin.html
index 491b27b..951127e 100644
--- a/help/en_US/scilab_en_US_help/cummin.html
+++ b/help/en_US/scilab_en_US_help/cummin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; cummin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; cummin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">cummin</h1>
@@ -73,7 +81,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/db.html b/help/en_US/scilab_en_US_help/db.html
index 649a921..9c37223 100644
--- a/help/en_US/scilab_en_US_help/db.html
+++ b/help/en_US/scilab_en_US_help/db.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; db</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; db</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">db</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/db2pow.html b/help/en_US/scilab_en_US_help/db2pow.html
index 77a539e..d9d33dd 100644
--- a/help/en_US/scilab_en_US_help/db2pow.html
+++ b/help/en_US/scilab_en_US_help/db2pow.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; db2pow</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; db2pow</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">db2pow</h1>
@@ -61,7 +69,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/dctmtx.html b/help/en_US/scilab_en_US_help/dctmtx.html
index 6fcdc3a..cab4192 100644
--- a/help/en_US/scilab_en_US_help/dctmtx.html
+++ b/help/en_US/scilab_en_US_help/dctmtx.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; dctmtx</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; dctmtx</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">dctmtx</h1>
@@ -65,7 +73,11 @@ dctmtx(n) returns a Discrete cosine transform matrix of order n-by-n. It is usef
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/decimate.html b/help/en_US/scilab_en_US_help/decimate.html
index 72b845e..22233a1 100644
--- a/help/en_US/scilab_en_US_help/decimate.html
+++ b/help/en_US/scilab_en_US_help/decimate.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; decimate</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; decimate</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">decimate</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/dftmtx.html b/help/en_US/scilab_en_US_help/dftmtx.html
index 435a301..0d168d3 100644
--- a/help/en_US/scilab_en_US_help/dftmtx.html
+++ b/help/en_US/scilab_en_US_help/dftmtx.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; dftmtx</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; dftmtx</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">dftmtx</h1>
@@ -63,7 +71,11 @@ This fuction gives a complex matrix of values whose product with a vector produc
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/diric.html b/help/en_US/scilab_en_US_help/diric.html
index 3df02a0..8101e14 100644
--- a/help/en_US/scilab_en_US_help/diric.html
+++ b/help/en_US/scilab_en_US_help/diric.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; diric</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; diric</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">diric</h1>
@@ -65,7 +73,11 @@ y=diric(x,n) returns the dirichlet function values of parameter x.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/downsample.html b/help/en_US/scilab_en_US_help/downsample.html
index bf881c4..e848ee4 100644
--- a/help/en_US/scilab_en_US_help/downsample.html
+++ b/help/en_US/scilab_en_US_help/downsample.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; downsample</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; downsample</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">downsample</h1>
@@ -68,7 +76,11 @@ If the phase is specified, every nth element is selected starting from the sampl
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/dutycycle.html b/help/en_US/scilab_en_US_help/dutycycle.html
index ac79507..a666f42 100644
--- a/help/en_US/scilab_en_US_help/dutycycle.html
+++ b/help/en_US/scilab_en_US_help/dutycycle.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; dutycycle</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; dutycycle</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">dutycycle</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/ellip.html b/help/en_US/scilab_en_US_help/ellip.html
index 3b74ca3..f86e2d4 100644
--- a/help/en_US/scilab_en_US_help/ellip.html
+++ b/help/en_US/scilab_en_US_help/ellip.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; ellip</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; ellip</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">ellip</h1>
@@ -81,7 +89,11 @@ This function generates an elliptic or Cauer filter with rp dB of passband rippl
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/ellipord.html b/help/en_US/scilab_en_US_help/ellipord.html
index 7048900..c0e1652 100644
--- a/help/en_US/scilab_en_US_help/ellipord.html
+++ b/help/en_US/scilab_en_US_help/ellipord.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; ellipord</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; ellipord</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">ellipord</h1>
@@ -75,7 +83,11 @@ If wp is contained within the lower and upper limits of ws, the filter is a band
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/enbw.html b/help/en_US/scilab_en_US_help/enbw.html
index 3927e53..58ceb75 100644
--- a/help/en_US/scilab_en_US_help/enbw.html
+++ b/help/en_US/scilab_en_US_help/enbw.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; enbw</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; enbw</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">enbw</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/eqtflength.html b/help/en_US/scilab_en_US_help/eqtflength.html
index 1483b6f..bbb2472 100644
--- a/help/en_US/scilab_en_US_help/eqtflength.html
+++ b/help/en_US/scilab_en_US_help/eqtflength.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; eqtflength</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; eqtflength</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">eqtflength</h1>
@@ -50,7 +58,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/falltime.html b/help/en_US/scilab_en_US_help/falltime.html
index 19af7d9..687b7ca 100644
--- a/help/en_US/scilab_en_US_help/falltime.html
+++ b/help/en_US/scilab_en_US_help/falltime.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; falltime</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; falltime</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">falltime</h1>
@@ -87,7 +95,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/fftfilt.html b/help/en_US/scilab_en_US_help/fftfilt.html
index 6752cc0..bd79a6d 100644
--- a/help/en_US/scilab_en_US_help/fftfilt.html
+++ b/help/en_US/scilab_en_US_help/fftfilt.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; fftfilt</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; fftfilt</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">fftfilt</h1>
@@ -76,7 +84,11 @@ y = fftfilt(b,x,n) uses n to determine the length of the FFT.</p>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/filternorm.html b/help/en_US/scilab_en_US_help/filternorm.html
index bae9db8..ce3973a 100644
--- a/help/en_US/scilab_en_US_help/filternorm.html
+++ b/help/en_US/scilab_en_US_help/filternorm.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; filternorm</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; filternorm</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">filternorm</h1>
@@ -74,7 +82,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/filtfilt.html b/help/en_US/scilab_en_US_help/filtfilt.html
index fdad974..9a28145 100644
--- a/help/en_US/scilab_en_US_help/filtfilt.html
+++ b/help/en_US/scilab_en_US_help/filtfilt.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; filtfilt</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; filtfilt</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">filtfilt</h1>
@@ -65,7 +73,11 @@ In theory, it forwards and reverse filters the signal and corrects phase distort
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/filtic.html b/help/en_US/scilab_en_US_help/filtic.html
index 9de5c42..0730573 100644
--- a/help/en_US/scilab_en_US_help/filtic.html
+++ b/help/en_US/scilab_en_US_help/filtic.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; filtic</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; filtic</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">filtic</h1>
@@ -72,7 +80,11 @@ The vectors b and a represent the numerator and denominator coefficients of the
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/filtord.html b/help/en_US/scilab_en_US_help/filtord.html
index b03e94c..b9eaec1 100644
--- a/help/en_US/scilab_en_US_help/filtord.html
+++ b/help/en_US/scilab_en_US_help/filtord.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; filtord</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; filtord</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">filtord</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/firpmord.html b/help/en_US/scilab_en_US_help/firpmord.html
index 1ecbffb..c9d1213 100644
--- a/help/en_US/scilab_en_US_help/firpmord.html
+++ b/help/en_US/scilab_en_US_help/firpmord.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; firpmord</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; firpmord</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">firpmord</h1>
@@ -94,7 +102,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/firtype.html b/help/en_US/scilab_en_US_help/firtype.html
index b8c1f8f..f9ef4dd 100644
--- a/help/en_US/scilab_en_US_help/firtype.html
+++ b/help/en_US/scilab_en_US_help/firtype.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; firtype</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; firtype</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">firtype</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/flattopwin.html b/help/en_US/scilab_en_US_help/flattopwin.html
index c091bec..d15e09d 100644
--- a/help/en_US/scilab_en_US_help/flattopwin.html
+++ b/help/en_US/scilab_en_US_help/flattopwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; flattopwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; flattopwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">flattopwin</h1>
@@ -76,7 +84,11 @@ This window has low pass-band ripple but a high bandwidth.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/fracshift.html b/help/en_US/scilab_en_US_help/fracshift.html
index f6055b0..2f7edf7 100644
--- a/help/en_US/scilab_en_US_help/fracshift.html
+++ b/help/en_US/scilab_en_US_help/fracshift.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; fracshift</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; fracshift</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">fracshift</h1>
@@ -69,7 +77,11 @@ The third parameter is the interpolator, which is designed with a Kaiser-windowe
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/fwhm.html b/help/en_US/scilab_en_US_help/fwhm.html
index ddf43c9..bb8ac8f 100644
--- a/help/en_US/scilab_en_US_help/fwhm.html
+++ b/help/en_US/scilab_en_US_help/fwhm.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; fwhm</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; fwhm</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">fwhm</h1>
@@ -58,7 +66,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/fwhmjlt.html b/help/en_US/scilab_en_US_help/fwhmjlt.html
index ae69f39..bcf0fd2 100644
--- a/help/en_US/scilab_en_US_help/fwhmjlt.html
+++ b/help/en_US/scilab_en_US_help/fwhmjlt.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; fwhmjlt</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; fwhmjlt</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">fwhmjlt</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/gauspuls.html b/help/en_US/scilab_en_US_help/gauspuls.html
index 9c18ddf..4f5b927 100644
--- a/help/en_US/scilab_en_US_help/gauspuls.html
+++ b/help/en_US/scilab_en_US_help/gauspuls.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; gauspuls</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; gauspuls</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">gauspuls</h1>
@@ -69,7 +77,11 @@ This function returns a Gaussian RF pulse of unity amplitude at the times indica
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/gaussdesign.html b/help/en_US/scilab_en_US_help/gaussdesign.html
index df0fff2..d2c1294 100644
--- a/help/en_US/scilab_en_US_help/gaussdesign.html
+++ b/help/en_US/scilab_en_US_help/gaussdesign.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; gaussdesign</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; gaussdesign</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">gaussdesign</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/gaussian.html b/help/en_US/scilab_en_US_help/gaussian.html
index f1b381b..e8a2c34 100644
--- a/help/en_US/scilab_en_US_help/gaussian.html
+++ b/help/en_US/scilab_en_US_help/gaussian.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; gaussian</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; gaussian</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">gaussian</h1>
@@ -72,7 +80,11 @@ The second parameter is the width measured in sample rate/number of samples and
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/gausswin.html b/help/en_US/scilab_en_US_help/gausswin.html
index a19ce49..5e78b8d 100644
--- a/help/en_US/scilab_en_US_help/gausswin.html
+++ b/help/en_US/scilab_en_US_help/gausswin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; gausswin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; gausswin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">gausswin</h1>
@@ -70,7 +78,11 @@ The second parameter is the width measured in sample rate/number of samples and
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/gmonopuls.html b/help/en_US/scilab_en_US_help/gmonopuls.html
index 9120294..a9f8671 100644
--- a/help/en_US/scilab_en_US_help/gmonopuls.html
+++ b/help/en_US/scilab_en_US_help/gmonopuls.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; gmonopuls</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; gmonopuls</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">gmonopuls</h1>
@@ -62,7 +70,11 @@ This function returns samples of the Gaussian monopulse of amplitude unity.</p><
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/goertzel.html b/help/en_US/scilab_en_US_help/goertzel.html
index 6495a56..87761a4 100644
--- a/help/en_US/scilab_en_US_help/goertzel.html
+++ b/help/en_US/scilab_en_US_help/goertzel.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; goertzel</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; goertzel</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">goertzel</h1>
@@ -75,7 +83,11 @@ Goertzel, G. (January 1958), &#0034;An Algorithm for the Evaluation of Finite Tr
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/grpdelay.html b/help/en_US/scilab_en_US_help/grpdelay.html
index a3bb78f..9d89429 100644
--- a/help/en_US/scilab_en_US_help/grpdelay.html
+++ b/help/en_US/scilab_en_US_help/grpdelay.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; grpdelay</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; grpdelay</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">grpdelay</h1>
@@ -54,7 +62,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/hann.html b/help/en_US/scilab_en_US_help/hann.html
index b591032..71081c2 100644
--- a/help/en_US/scilab_en_US_help/hann.html
+++ b/help/en_US/scilab_en_US_help/hann.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; hann</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; hann</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">hann</h1>
@@ -74,7 +82,11 @@ The second parameter can take the values &#0034;periodic&#0034; or &#0034;symmet
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/helperHarmonicDistortionAmplifier.html b/help/en_US/scilab_en_US_help/helperHarmonicDistortionAmplifier.html
index eae2fce..6329fe9 100644
--- a/help/en_US/scilab_en_US_help/helperHarmonicDistortionAmplifier.html
+++ b/help/en_US/scilab_en_US_help/helperHarmonicDistortionAmplifier.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; helperHarmonicDistortionAmplifier</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; helperHarmonicDistortionAmplifier</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">helperHarmonicDistortionAmplifier</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/icceps.html b/help/en_US/scilab_en_US_help/icceps.html
index 6afa028..161120d 100644
--- a/help/en_US/scilab_en_US_help/icceps.html
+++ b/help/en_US/scilab_en_US_help/icceps.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; icceps</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; icceps</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">icceps</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/iirlp2mb.html b/help/en_US/scilab_en_US_help/iirlp2mb.html
index 6fab08b..9df0cb6 100644
--- a/help/en_US/scilab_en_US_help/iirlp2mb.html
+++ b/help/en_US/scilab_en_US_help/iirlp2mb.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; iirlp2mb</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; iirlp2mb</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">iirlp2mb</h1>
@@ -74,7 +82,11 @@ The fifth parameter can have values pass or stop, default value is pass.</p></di
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/impinvar.html b/help/en_US/scilab_en_US_help/impinvar.html
index 3ea0ca4..1c2f34e 100644
--- a/help/en_US/scilab_en_US_help/impinvar.html
+++ b/help/en_US/scilab_en_US_help/impinvar.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; impinvar</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; impinvar</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">impinvar</h1>
@@ -75,7 +83,11 @@ This function does the inverse of impinvar.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/impz.html b/help/en_US/scilab_en_US_help/impz.html
index a415c52..fb6f4a2 100644
--- a/help/en_US/scilab_en_US_help/impz.html
+++ b/help/en_US/scilab_en_US_help/impz.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; impz</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; impz</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">impz</h1>
@@ -53,7 +61,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/impzlength.html b/help/en_US/scilab_en_US_help/impzlength.html
index eda3c06..d006ba5 100644
--- a/help/en_US/scilab_en_US_help/impzlength.html
+++ b/help/en_US/scilab_en_US_help/impzlength.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; impzlength</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; impzlength</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">impzlength</h1>
@@ -78,7 +86,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html
index 7df4041..b4cfef9 100644
--- a/help/en_US/scilab_en_US_help/index.html
+++ b/help/en_US/scilab_en_US_help/index.html
@@ -31,7 +31,11 @@
<h3 class="book-title">FOSSEE Signal Processing Toolbox</h3>
<ul class="list-part"><a name="fossee_signal_processing_toolbox_manual"></a><div class="info"></div>
+<<<<<<< HEAD
<li><a href="section_5118e822ecc2888aa80042108de4932e.html" class="part">FOSSEE Signal Processing Toolbox</a>
+=======
+<li><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html" class="part">FOSSEE Signal Processing Toolbox</a>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<ul class="list-chapter"><li><a href="ac2poly.html" class="refentry">ac2poly</a> &#8212; <span class="refentry-description">Convert autocorrelation sequence to polynomial of prediction filter</span></li>
diff --git a/help/en_US/scilab_en_US_help/interp.html b/help/en_US/scilab_en_US_help/interp.html
index 0fff581..b282ed4 100644
--- a/help/en_US/scilab_en_US_help/interp.html
+++ b/help/en_US/scilab_en_US_help/interp.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; interp</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; interp</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">interp</h1>
@@ -71,7 +79,11 @@ The second argument q must be an integer. The default values of the third and fo
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/intfilt.html b/help/en_US/scilab_en_US_help/intfilt.html
index 588ac3d..57360bf 100644
--- a/help/en_US/scilab_en_US_help/intfilt.html
+++ b/help/en_US/scilab_en_US_help/intfilt.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; intfilt</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; intfilt</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">intfilt</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/invimpinvar.html b/help/en_US/scilab_en_US_help/invimpinvar.html
index 74c4552..1ef85ce 100644
--- a/help/en_US/scilab_en_US_help/invimpinvar.html
+++ b/help/en_US/scilab_en_US_help/invimpinvar.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; invimpinvar</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; invimpinvar</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">invimpinvar</h1>
@@ -78,7 +86,11 @@ This function does the inverse of impinvar.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/is2rc.html b/help/en_US/scilab_en_US_help/is2rc.html
index 890ba42..b39b0bb 100644
--- a/help/en_US/scilab_en_US_help/is2rc.html
+++ b/help/en_US/scilab_en_US_help/is2rc.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; is2rc</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; is2rc</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">is2rc</h1>
@@ -75,7 +83,11 @@ k_dash = is2rc(isin)</p>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/isallpass.html b/help/en_US/scilab_en_US_help/isallpass.html
index d5115a2..2a66eae 100644
--- a/help/en_US/scilab_en_US_help/isallpass.html
+++ b/help/en_US/scilab_en_US_help/isallpass.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; isallpass</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; isallpass</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">isallpass</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/isfir.html b/help/en_US/scilab_en_US_help/isfir.html
index 4b00d48..5239c20 100644
--- a/help/en_US/scilab_en_US_help/isfir.html
+++ b/help/en_US/scilab_en_US_help/isfir.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; isfir</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; isfir</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">isfir</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/islinphase.html b/help/en_US/scilab_en_US_help/islinphase.html
index 28080fb..a484d5c 100644
--- a/help/en_US/scilab_en_US_help/islinphase.html
+++ b/help/en_US/scilab_en_US_help/islinphase.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; islinphase</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; islinphase</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">islinphase</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/ismaxphase.html b/help/en_US/scilab_en_US_help/ismaxphase.html
index be3703e..80ea52d 100644
--- a/help/en_US/scilab_en_US_help/ismaxphase.html
+++ b/help/en_US/scilab_en_US_help/ismaxphase.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; ismaxphase</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; ismaxphase</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">ismaxphase</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/isminphase.html b/help/en_US/scilab_en_US_help/isminphase.html
index 5ab1282..dece57a 100644
--- a/help/en_US/scilab_en_US_help/isminphase.html
+++ b/help/en_US/scilab_en_US_help/isminphase.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; isminphase</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; isminphase</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">isminphase</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/isstable.html b/help/en_US/scilab_en_US_help/isstable.html
index 346f1ca..9936e6c 100644
--- a/help/en_US/scilab_en_US_help/isstable.html
+++ b/help/en_US/scilab_en_US_help/isstable.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; isstable</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; isstable</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">isstable</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm
index f8e4965..f11b764 100644
--- a/help/en_US/scilab_en_US_help/jhelpmap.jhm
+++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm
@@ -2,7 +2,11 @@
<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_1_0.dtd">
<map version="1.0">
<mapID target="index" url="index.html"/>
+<<<<<<< HEAD
<mapID target="section_5118e822ecc2888aa80042108de4932e" url="section_5118e822ecc2888aa80042108de4932e.html"/>
+=======
+<mapID target="section_cc2bc01c47967d47fcf3507a91d572ba" url="section_cc2bc01c47967d47fcf3507a91d572ba.html"/>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<mapID target="ac2poly" url="ac2poly.html"/>
<mapID target="ac2rc" url="ac2rc.html"/>
<mapID target="arParEst" url="arParEst.html"/>
diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml
index d47d3dc..0fd1d32 100644
--- a/help/en_US/scilab_en_US_help/jhelptoc.xml
+++ b/help/en_US/scilab_en_US_help/jhelptoc.xml
@@ -2,7 +2,11 @@
<!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">
+<<<<<<< HEAD
<tocitem target="section_5118e822ecc2888aa80042108de4932e" text="FOSSEE Signal Processing Toolbox">
+=======
+<tocitem target="section_cc2bc01c47967d47fcf3507a91d572ba" text="FOSSEE Signal Processing Toolbox">
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<tocitem target="ac2poly" text="ac2poly"/>
<tocitem target="ac2rc" text="ac2rc"/>
<tocitem target="arParEst" text="arParEst"/>
diff --git a/help/en_US/scilab_en_US_help/kaiser.html b/help/en_US/scilab_en_US_help/kaiser.html
index 7600f1d..ab256cc 100644
--- a/help/en_US/scilab_en_US_help/kaiser.html
+++ b/help/en_US/scilab_en_US_help/kaiser.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; kaiser</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; kaiser</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">kaiser</h1>
@@ -73,7 +81,11 @@ The second parameter gives the stop band attenuation of the Fourier transform of
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/lar2rc.html b/help/en_US/scilab_en_US_help/lar2rc.html
index 6c3d7bb..0851b6a 100644
--- a/help/en_US/scilab_en_US_help/lar2rc.html
+++ b/help/en_US/scilab_en_US_help/lar2rc.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; lar2rc</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; lar2rc</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">lar2rc</h1>
@@ -66,7 +74,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/latc2tf.html b/help/en_US/scilab_en_US_help/latc2tf.html
index 2884393..9e807b5 100644
--- a/help/en_US/scilab_en_US_help/latc2tf.html
+++ b/help/en_US/scilab_en_US_help/latc2tf.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; latc2tf</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; latc2tf</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">latc2tf</h1>
@@ -89,7 +97,11 @@ Speficication of the type of FIR filter</p>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/latcfilt.html b/help/en_US/scilab_en_US_help/latcfilt.html
index 832e231..96596a7 100644
--- a/help/en_US/scilab_en_US_help/latcfilt.html
+++ b/help/en_US/scilab_en_US_help/latcfilt.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; latcfilt</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; latcfilt</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">latcfilt</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/latcfilt1.html b/help/en_US/scilab_en_US_help/latcfilt1.html
index 485144d..16934e6 100644
--- a/help/en_US/scilab_en_US_help/latcfilt1.html
+++ b/help/en_US/scilab_en_US_help/latcfilt1.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; latcfilt1</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; latcfilt1</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">latcfilt1</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/levdown.html b/help/en_US/scilab_en_US_help/levdown.html
index 3682b10..62325b0 100644
--- a/help/en_US/scilab_en_US_help/levdown.html
+++ b/help/en_US/scilab_en_US_help/levdown.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; levdown</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; levdown</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">levdown</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/levin.html b/help/en_US/scilab_en_US_help/levin.html
index 4440749..3a69f30 100644
--- a/help/en_US/scilab_en_US_help/levin.html
+++ b/help/en_US/scilab_en_US_help/levin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; levin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; levin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">levin</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/levinson.html b/help/en_US/scilab_en_US_help/levinson.html
index 96b439f..6cdb39e 100644
--- a/help/en_US/scilab_en_US_help/levinson.html
+++ b/help/en_US/scilab_en_US_help/levinson.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; levinson</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; levinson</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">levinson</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/lpc.html b/help/en_US/scilab_en_US_help/lpc.html
index f77a35f..41b16db 100644
--- a/help/en_US/scilab_en_US_help/lpc.html
+++ b/help/en_US/scilab_en_US_help/lpc.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; lpc</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; lpc</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">lpc</h1>
@@ -84,7 +92,11 @@ default value of length(x)-1 is used.</p>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/lsf2poly.html b/help/en_US/scilab_en_US_help/lsf2poly.html
index 3446149..49f19a4 100644
--- a/help/en_US/scilab_en_US_help/lsf2poly.html
+++ b/help/en_US/scilab_en_US_help/lsf2poly.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; lsf2poly</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; lsf2poly</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">lsf2poly</h1>
@@ -49,7 +57,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/mag2db.html b/help/en_US/scilab_en_US_help/mag2db.html
index 8affb19..aa97996 100644
--- a/help/en_US/scilab_en_US_help/mag2db.html
+++ b/help/en_US/scilab_en_US_help/mag2db.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; mag2db</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; mag2db</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">mag2db</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/marcumq.html b/help/en_US/scilab_en_US_help/marcumq.html
index d0cf529..dc94e7d 100644
--- a/help/en_US/scilab_en_US_help/marcumq.html
+++ b/help/en_US/scilab_en_US_help/marcumq.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; marcumq</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; marcumq</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">marcumq</h1>
@@ -74,7 +82,11 @@ This function calculates Marcum’s Q function using the infinite Bessel series,
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/medfilt1.html b/help/en_US/scilab_en_US_help/medfilt1.html
index 10d41ae..c909f73 100644
--- a/help/en_US/scilab_en_US_help/medfilt1.html
+++ b/help/en_US/scilab_en_US_help/medfilt1.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; medfilt1</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; medfilt1</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">medfilt1</h1>
@@ -96,7 +104,11 @@ type of filtering to be performed at the signal edges.</p>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/mexihat.html b/help/en_US/scilab_en_US_help/mexihat.html
index 8eaec9f..390c81a 100644
--- a/help/en_US/scilab_en_US_help/mexihat.html
+++ b/help/en_US/scilab_en_US_help/mexihat.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; mexihat</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; mexihat</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">mexihat</h1>
@@ -69,7 +77,11 @@ This function returns values of the Mexican hat wavelet in the specified interva
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/meyeraux.html b/help/en_US/scilab_en_US_help/meyeraux.html
index 743011f..fb7d101 100644
--- a/help/en_US/scilab_en_US_help/meyeraux.html
+++ b/help/en_US/scilab_en_US_help/meyeraux.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; meyeraux</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; meyeraux</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">meyeraux</h1>
@@ -63,7 +71,11 @@ This function returns values of the auxiliary function used for Meyer wavelet ge
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/midcross.html b/help/en_US/scilab_en_US_help/midcross.html
index 100312d..7d2bfaa 100644
--- a/help/en_US/scilab_en_US_help/midcross.html
+++ b/help/en_US/scilab_en_US_help/midcross.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; midcross</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; midcross</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">midcross</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/modulate.html b/help/en_US/scilab_en_US_help/modulate.html
index bb35618..8e9bbcb 100644
--- a/help/en_US/scilab_en_US_help/modulate.html
+++ b/help/en_US/scilab_en_US_help/modulate.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; modulate</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; modulate</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">modulate</h1>
@@ -90,7 +98,11 @@ Ankur Mallick</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/morlet.html b/help/en_US/scilab_en_US_help/morlet.html
index 26a1cbb..3df48cc 100644
--- a/help/en_US/scilab_en_US_help/morlet.html
+++ b/help/en_US/scilab_en_US_help/morlet.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; morlet</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; morlet</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">morlet</h1>
@@ -69,7 +77,11 @@ This function returns values of the Morlet wavelet in the specified interval for
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/movingrms.html b/help/en_US/scilab_en_US_help/movingrms.html
index 51870f1..696d111 100644
--- a/help/en_US/scilab_en_US_help/movingrms.html
+++ b/help/en_US/scilab_en_US_help/movingrms.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; movingrms</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; movingrms</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">movingrms</h1>
@@ -75,7 +83,11 @@ The signal is convoluted against a sigmoid window of width w and risetime rc wit
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/musicBase.html b/help/en_US/scilab_en_US_help/musicBase.html
index 707caff..1f67379 100644
--- a/help/en_US/scilab_en_US_help/musicBase.html
+++ b/help/en_US/scilab_en_US_help/musicBase.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; musicBase</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; musicBase</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">musicBase</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/nnls.html b/help/en_US/scilab_en_US_help/nnls.html
index 27d617f..dc3577e 100644
--- a/help/en_US/scilab_en_US_help/nnls.html
+++ b/help/en_US/scilab_en_US_help/nnls.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; nnls</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; nnls</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">nnls</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/nuttallwin.html b/help/en_US/scilab_en_US_help/nuttallwin.html
index 5d80523..caffcb9 100644
--- a/help/en_US/scilab_en_US_help/nuttallwin.html
+++ b/help/en_US/scilab_en_US_help/nuttallwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; nuttallwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; nuttallwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">nuttallwin</h1>
@@ -69,7 +77,11 @@ The second parameter can take the values &#0034;periodic&#0034; or &#0034;symmet
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/parzenwin.html b/help/en_US/scilab_en_US_help/parzenwin.html
index f81a0c9..a5f4f88 100644
--- a/help/en_US/scilab_en_US_help/parzenwin.html
+++ b/help/en_US/scilab_en_US_help/parzenwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; parzenwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; parzenwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">parzenwin</h1>
@@ -66,7 +74,11 @@ This function returns the filter coefficients of a Parzen window of length m sup
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pchip.html b/help/en_US/scilab_en_US_help/pchip.html
index 5e87991..15d6b5d 100644
--- a/help/en_US/scilab_en_US_help/pchip.html
+++ b/help/en_US/scilab_en_US_help/pchip.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pchip</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pchip</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pchip</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pchips.html b/help/en_US/scilab_en_US_help/pchips.html
index 1b6adbb..bc13942 100644
--- a/help/en_US/scilab_en_US_help/pchips.html
+++ b/help/en_US/scilab_en_US_help/pchips.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pchips</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pchips</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pchips</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/peak2peak.html b/help/en_US/scilab_en_US_help/peak2peak.html
index 5ec9438..4807c61 100644
--- a/help/en_US/scilab_en_US_help/peak2peak.html
+++ b/help/en_US/scilab_en_US_help/peak2peak.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; peak2peak</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; peak2peak</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">peak2peak</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/peak2rms.html b/help/en_US/scilab_en_US_help/peak2rms.html
index 0837e9a..ecd2b47 100644
--- a/help/en_US/scilab_en_US_help/peak2rms.html
+++ b/help/en_US/scilab_en_US_help/peak2rms.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; peak2rms</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; peak2rms</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">peak2rms</h1>
@@ -113,7 +121,11 @@ The orientation can be given as string with values &#0034;r&#0034;,&#0034;c&#00
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/peig.html b/help/en_US/scilab_en_US_help/peig.html
index 90f3568..c3716cc 100644
--- a/help/en_US/scilab_en_US_help/peig.html
+++ b/help/en_US/scilab_en_US_help/peig.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; peig</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; peig</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">peig</h1>
@@ -111,7 +119,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/periodogram.html b/help/en_US/scilab_en_US_help/periodogram.html
index 8039342..27e20d8 100644
--- a/help/en_US/scilab_en_US_help/periodogram.html
+++ b/help/en_US/scilab_en_US_help/periodogram.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; periodogram</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; periodogram</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">periodogram</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/phaseInputParseAs_ab.html b/help/en_US/scilab_en_US_help/phaseInputParseAs_ab.html
index 5313f3a..ecba9b2 100644
--- a/help/en_US/scilab_en_US_help/phaseInputParseAs_ab.html
+++ b/help/en_US/scilab_en_US_help/phaseInputParseAs_ab.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; phaseInputParseAs_ab</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; phaseInputParseAs_ab</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">phaseInputParseAs_ab</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/phaseInputParseAs_sos.html b/help/en_US/scilab_en_US_help/phaseInputParseAs_sos.html
index 98c5c34..6f33487 100644
--- a/help/en_US/scilab_en_US_help/phaseInputParseAs_sos.html
+++ b/help/en_US/scilab_en_US_help/phaseInputParseAs_sos.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; phaseInputParseAs_sos</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; phaseInputParseAs_sos</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">phaseInputParseAs_sos</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/phasedelay.html b/help/en_US/scilab_en_US_help/phasedelay.html
index 8301a68..e06a485 100644
--- a/help/en_US/scilab_en_US_help/phasedelay.html
+++ b/help/en_US/scilab_en_US_help/phasedelay.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; phasedelay</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; phasedelay</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">phasedelay</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/phasez.html b/help/en_US/scilab_en_US_help/phasez.html
index 0176802..2fcf502 100644
--- a/help/en_US/scilab_en_US_help/phasez.html
+++ b/help/en_US/scilab_en_US_help/phasez.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; phasez</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; phasez</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">phasez</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pmusic.html b/help/en_US/scilab_en_US_help/pmusic.html
index 9ac6d14..2a0192a 100644
--- a/help/en_US/scilab_en_US_help/pmusic.html
+++ b/help/en_US/scilab_en_US_help/pmusic.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pmusic</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pmusic</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pmusic</h1>
@@ -111,7 +119,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/poly2ac.html b/help/en_US/scilab_en_US_help/poly2ac.html
index ed559ec..c6d4bb4 100644
--- a/help/en_US/scilab_en_US_help/poly2ac.html
+++ b/help/en_US/scilab_en_US_help/poly2ac.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; poly2ac</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; poly2ac</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">poly2ac</h1>
@@ -78,7 +86,11 @@ denominator polynomial and the numerator scaling. The filter is H(z) = efinal/(a
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/poly2lsf.html b/help/en_US/scilab_en_US_help/poly2lsf.html
index 757b6a3..cd25401 100644
--- a/help/en_US/scilab_en_US_help/poly2lsf.html
+++ b/help/en_US/scilab_en_US_help/poly2lsf.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; poly2lsf</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; poly2lsf</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">poly2lsf</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/poly2rc.html b/help/en_US/scilab_en_US_help/poly2rc.html
index b2ae82b..6c0b87f 100644
--- a/help/en_US/scilab_en_US_help/poly2rc.html
+++ b/help/en_US/scilab_en_US_help/poly2rc.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; poly2rc</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; poly2rc</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">poly2rc</h1>
@@ -50,7 +58,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/polyscale.html b/help/en_US/scilab_en_US_help/polyscale.html
index 393f870..2b0ba25 100644
--- a/help/en_US/scilab_en_US_help/polyscale.html
+++ b/help/en_US/scilab_en_US_help/polyscale.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; polyscale</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; polyscale</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">polyscale</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/polystab.html b/help/en_US/scilab_en_US_help/polystab.html
index f554e26..5f1aa26 100644
--- a/help/en_US/scilab_en_US_help/polystab.html
+++ b/help/en_US/scilab_en_US_help/polystab.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; polystab</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; polystab</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">polystab</h1>
@@ -62,7 +70,11 @@ This function stabilizes the polynomial transfer function by replacing all roots
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/polyval.html b/help/en_US/scilab_en_US_help/polyval.html
index 58cc6e6..9857d8d 100644
--- a/help/en_US/scilab_en_US_help/polyval.html
+++ b/help/en_US/scilab_en_US_help/polyval.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; polyval</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; polyval</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">polyval</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pow2db.html b/help/en_US/scilab_en_US_help/pow2db.html
index 737148a..0493af3 100644
--- a/help/en_US/scilab_en_US_help/pow2db.html
+++ b/help/en_US/scilab_en_US_help/pow2db.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pow2db</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pow2db</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pow2db</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/primitive.html b/help/en_US/scilab_en_US_help/primitive.html
index 1189a38..e5e157b 100644
--- a/help/en_US/scilab_en_US_help/primitive.html
+++ b/help/en_US/scilab_en_US_help/primitive.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; primitive</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; primitive</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">primitive</h1>
@@ -67,7 +75,11 @@ The function approximates the primitive (indefinite integral) of the univariate
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/prony.html b/help/en_US/scilab_en_US_help/prony.html
index c5404ff..5d2e316 100644
--- a/help/en_US/scilab_en_US_help/prony.html
+++ b/help/en_US/scilab_en_US_help/prony.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; prony</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; prony</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">prony</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pulseperiod.html b/help/en_US/scilab_en_US_help/pulseperiod.html
index d3b29e0..8268678 100644
--- a/help/en_US/scilab_en_US_help/pulseperiod.html
+++ b/help/en_US/scilab_en_US_help/pulseperiod.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pulseperiod</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pulseperiod</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pulseperiod</h1>
@@ -55,7 +63,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pulsesep.html b/help/en_US/scilab_en_US_help/pulsesep.html
index 71e73d2..9a31cd7 100644
--- a/help/en_US/scilab_en_US_help/pulsesep.html
+++ b/help/en_US/scilab_en_US_help/pulsesep.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pulsesep</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pulsesep</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pulsesep</h1>
@@ -55,7 +63,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pulsewidth.html b/help/en_US/scilab_en_US_help/pulsewidth.html
index 33439d4..24e0e88 100644
--- a/help/en_US/scilab_en_US_help/pulsewidth.html
+++ b/help/en_US/scilab_en_US_help/pulsewidth.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pulsewidth</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pulsewidth</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pulsewidth</h1>
@@ -55,7 +63,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/pulstran.html b/help/en_US/scilab_en_US_help/pulstran.html
index 6340ef8..a56ff8d 100644
--- a/help/en_US/scilab_en_US_help/pulstran.html
+++ b/help/en_US/scilab_en_US_help/pulstran.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; pulstran</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; pulstran</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">pulstran</h1>
@@ -74,7 +82,11 @@ If a pulse shape sampled at frequency Fs (default 1 Hz) is supplied instead of a
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rc2ac.html b/help/en_US/scilab_en_US_help/rc2ac.html
index 14183e4..ad79727 100644
--- a/help/en_US/scilab_en_US_help/rc2ac.html
+++ b/help/en_US/scilab_en_US_help/rc2ac.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2ac</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2ac</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rc2ac</h1>
@@ -49,7 +57,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rc2is.html b/help/en_US/scilab_en_US_help/rc2is.html
index cb160d5..bc3f7ec 100644
--- a/help/en_US/scilab_en_US_help/rc2is.html
+++ b/help/en_US/scilab_en_US_help/rc2is.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2is</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2is</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rc2is</h1>
@@ -77,7 +85,11 @@ isin = rc2is(k) //Gives inverse sine parameters</p>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rc2lar.html b/help/en_US/scilab_en_US_help/rc2lar.html
index 3e61e70..9a33e41 100644
--- a/help/en_US/scilab_en_US_help/rc2lar.html
+++ b/help/en_US/scilab_en_US_help/rc2lar.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2lar</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2lar</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rc2lar</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rc2poly.html b/help/en_US/scilab_en_US_help/rc2poly.html
index f512373..a0ee136 100644
--- a/help/en_US/scilab_en_US_help/rc2poly.html
+++ b/help/en_US/scilab_en_US_help/rc2poly.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2poly</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rc2poly</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rc2poly</h1>
@@ -50,7 +58,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rcosdesign.html b/help/en_US/scilab_en_US_help/rcosdesign.html
index 5443a60..775412d 100644
--- a/help/en_US/scilab_en_US_help/rcosdesign.html
+++ b/help/en_US/scilab_en_US_help/rcosdesign.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rcosdesign</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rcosdesign</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rcosdesign</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rectpuls.html b/help/en_US/scilab_en_US_help/rectpuls.html
index 7127ef8..11cbc75 100644
--- a/help/en_US/scilab_en_US_help/rectpuls.html
+++ b/help/en_US/scilab_en_US_help/rectpuls.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rectpuls</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rectpuls</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rectpuls</h1>
@@ -67,7 +75,11 @@ y = rectpuls(t,w) generates a rectangle of width w.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rectwin.html b/help/en_US/scilab_en_US_help/rectwin.html
index 08a608c..e3354a4 100644
--- a/help/en_US/scilab_en_US_help/rectwin.html
+++ b/help/en_US/scilab_en_US_help/rectwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rectwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rectwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rectwin</h1>
@@ -66,7 +74,11 @@ This function returns the filter coefficients of a rectangular window of length
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/resample.html b/help/en_US/scilab_en_US_help/resample.html
index f466e9d..644a9ca 100644
--- a/help/en_US/scilab_en_US_help/resample.html
+++ b/help/en_US/scilab_en_US_help/resample.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; resample</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; resample</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">resample</h1>
@@ -70,7 +78,11 @@ This is performed using a polyphase algorithm. The impulse response h, given as
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/residued.html b/help/en_US/scilab_en_US_help/residued.html
index d515ef3..ca34041 100644
--- a/help/en_US/scilab_en_US_help/residued.html
+++ b/help/en_US/scilab_en_US_help/residued.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; residued</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; residued</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">residued</h1>
@@ -66,7 +74,11 @@ Similar to the &#0034;residuez&#0034; function. The difference being in the func
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/residuez.html b/help/en_US/scilab_en_US_help/residuez.html
index f579cfe..fac88a7 100644
--- a/help/en_US/scilab_en_US_help/residuez.html
+++ b/help/en_US/scilab_en_US_help/residuez.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; residuez</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; residuez</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">residuez</h1>
@@ -66,7 +74,11 @@ It compute the PFE of filter H(z)= B(z)/A(z) where inputs b and a are vectors sp
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/risetime.html b/help/en_US/scilab_en_US_help/risetime.html
index d2c26c0..af207f9 100644
--- a/help/en_US/scilab_en_US_help/risetime.html
+++ b/help/en_US/scilab_en_US_help/risetime.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; risetime</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; risetime</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">risetime</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rlevinson.html b/help/en_US/scilab_en_US_help/rlevinson.html
index f52e0d7..1a356a1 100644
--- a/help/en_US/scilab_en_US_help/rlevinson.html
+++ b/help/en_US/scilab_en_US_help/rlevinson.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rlevinson</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rlevinson</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rlevinson</h1>
@@ -52,7 +60,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rms.html b/help/en_US/scilab_en_US_help/rms.html
index a1b6884..ecd825f 100644
--- a/help/en_US/scilab_en_US_help/rms.html
+++ b/help/en_US/scilab_en_US_help/rms.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rms</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rms</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rms</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rooteig.html b/help/en_US/scilab_en_US_help/rooteig.html
index 1a5c5af..d2d1f2c 100644
--- a/help/en_US/scilab_en_US_help/rooteig.html
+++ b/help/en_US/scilab_en_US_help/rooteig.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rooteig</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rooteig</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rooteig</h1>
@@ -72,7 +80,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rootmusic.html b/help/en_US/scilab_en_US_help/rootmusic.html
index be8349b..fea0654 100644
--- a/help/en_US/scilab_en_US_help/rootmusic.html
+++ b/help/en_US/scilab_en_US_help/rootmusic.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rootmusic</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rootmusic</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rootmusic</h1>
@@ -72,7 +80,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/rssq.html b/help/en_US/scilab_en_US_help/rssq.html
index d921f54..20069cf 100644
--- a/help/en_US/scilab_en_US_help/rssq.html
+++ b/help/en_US/scilab_en_US_help/rssq.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; rssq</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; rssq</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">rssq</h1>
@@ -102,7 +110,11 @@ For rssq value of rows of matrix orientation should be 2 or c.</p>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sampled2continuous.html b/help/en_US/scilab_en_US_help/sampled2continuous.html
index 545fa2b..91e29d7 100644
--- a/help/en_US/scilab_en_US_help/sampled2continuous.html
+++ b/help/en_US/scilab_en_US_help/sampled2continuous.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sampled2continuous</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sampled2continuous</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sampled2continuous</h1>
@@ -67,7 +75,11 @@ The third parameter t is all the instants where output x is needed from intput n
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sawtooth.html b/help/en_US/scilab_en_US_help/sawtooth.html
index 74455a7..a52afe6 100644
--- a/help/en_US/scilab_en_US_help/sawtooth.html
+++ b/help/en_US/scilab_en_US_help/sawtooth.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sawtooth</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sawtooth</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sawtooth</h1>
@@ -66,7 +74,11 @@ This function returns a sawtooth wave with period 2*pi with +1/-1 as the maximum
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/schtrig.html b/help/en_US/scilab_en_US_help/schtrig.html
index 12a560e..2c5f2da 100644
--- a/help/en_US/scilab_en_US_help/schtrig.html
+++ b/help/en_US/scilab_en_US_help/schtrig.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; schtrig</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; schtrig</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">schtrig</h1>
@@ -68,7 +76,11 @@ The argument 1 is a matrix (or a vector) and this trigger works along its first
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/schurrc.html b/help/en_US/scilab_en_US_help/schurrc.html
index c53841b..ac55d04 100644
--- a/help/en_US/scilab_en_US_help/schurrc.html
+++ b/help/en_US/scilab_en_US_help/schurrc.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; schurrc</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; schurrc</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">schurrc</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/section_cc2bc01c47967d47fcf3507a91d572ba.html b/help/en_US/scilab_en_US_help/section_cc2bc01c47967d47fcf3507a91d572ba.html
new file mode 100644
index 0000000..9284e0b
--- /dev/null
+++ b/help/en_US/scilab_en_US_help/section_cc2bc01c47967d47fcf3507a91d572ba.html
@@ -0,0 +1,1207 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title></title>
+ <style type="text/css" media="all">
+ @import url("scilab_code.css");
+ @import url("xml_code.css");
+ @import url("c_code.css");
+ @import url("style.css");
+ </style>
+ </head>
+ <body>
+ <div class="manualnavbar">
+ <table width="100%"><tr>
+ <td width="30%">
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="index.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+
+
+
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; FOSSEE Signal Processing Toolbox</span>
+
+ <br /><br />
+ <h3 class="title-part">FOSSEE Signal Processing Toolbox</h3>
+<ul class="list-chapter"><li><a href="ac2poly.html" class="refentry">ac2poly</a> &#8212; <span class="refentry-description">Convert autocorrelation sequence to polynomial of prediction filter</span></li>
+
+
+
+
+
+<li><a href="ac2rc.html" class="refentry">ac2rc</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="arParEst.html" class="refentry">arParEst</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="arburg.html" class="refentry">arburg</a> &#8212; <span class="refentry-description">This function calculates coefficients of an autoregressive (AR) model of complex data.</span></li>
+
+
+
+
+
+<li><a href="arcov.html" class="refentry">arcov</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="armcov.html" class="refentry">armcov</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="aryule.html" class="refentry">aryule</a> &#8212; <span class="refentry-description">This function fits an AR (p)-model with Yule-Walker estimates.</span></li>
+
+
+
+
+
+<li><a href="barthannwin.html" class="refentry">barthannwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a modified Bartlett-Hann window.</span></li>
+
+
+
+
+
+<li><a href="bartlett.html" class="refentry">bartlett</a> &#8212; <span class="refentry-description">Generates a Bartlett window</span></li>
+
+
+
+
+
+<li><a href="besself.html" class="refentry">besself</a> &#8212; <span class="refentry-description">This function generates a Bessel filter.</span></li>
+
+
+
+
+
+<li><a href="bitrevorder.html" class="refentry">bitrevorder</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="blackman.html" class="refentry">blackman</a> &#8212; <span class="refentry-description">Generates a Blackman window</span></li>
+
+
+
+
+
+<li><a href="blackmanharris.html" class="refentry">blackmanharris</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Blackman-Harris window.</span></li>
+
+
+
+
+
+<li><a href="blackmannuttall.html" class="refentry">blackmannuttall</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Blackman-Nuttall window.</span></li>
+
+
+
+
+
+<li><a href="bohmanwin.html" class="refentry">bohmanwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Bohman window.</span></li>
+
+
+
+
+
+<li><a href="boxcar.html" class="refentry">boxcar</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a rectangular window.</span></li>
+
+
+
+
+
+<li><a href="buffer.html" class="refentry">buffer</a> &#8212; <span class="refentry-description">This function buffers the given data into a matrix of signal frames</span></li>
+
+
+
+
+
+<li><a href="butter.html" class="refentry">butter</a> &#8212; <span class="refentry-description">This function generates a Butterworth filter.</span></li>
+
+
+
+
+
+<li><a href="buttord.html" class="refentry">buttord</a> &#8212; <span class="refentry-description">/This function computes the minimum filter order of a Butterworth filter with the desired response characteristics.</span></li>
+
+
+
+
+
+<li><a href="cconv.html" class="refentry">cconv</a> &#8212; <span class="refentry-description">[nargout,nargin]=argn();</span></li>
+
+
+
+
+
+<li><a href="cell2sos.html" class="refentry">cell2sos</a> &#8212; <span class="refentry-description">Converts a cell array to a second order section matrix</span></li>
+
+
+
+
+
+<li><a href="cheb1ord.html" class="refentry">cheb1ord</a> &#8212; <span class="refentry-description">This function computes the minimum filter order of a Chebyshev type I filter with the desired response characteristics.</span></li>
+
+
+
+
+
+<li><a href="cheb2ord.html" class="refentry">cheb2ord</a> &#8212; <span class="refentry-description">This function computes the minimum filter order of a Chebyshev type II filter with the desired response characteristics.</span></li>
+
+
+
+
+
+<li><a href="chebwin.html" class="refentry">chebwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Dolph-Chebyshev window.</span></li>
+
+
+
+
+
+<li><a href="cheby1.html" class="refentry">cheby1</a> &#8212; <span class="refentry-description">This function generates a Chebyshev type I filter with rp dB of passband ripple.</span></li>
+
+
+
+
+
+<li><a href="cheby2.html" class="refentry">cheby2</a> &#8212; <span class="refentry-description">This function generates a Chebyshev type II filter with rs dB of stopband attenuation.</span></li>
+
+
+
+
+
+<li><a href="check.html" class="refentry">check</a> &#8212; <span class="refentry-description">funcprot(0);</span></li>
+
+
+
+
+
+<li><a href="chirp.html" class="refentry">chirp</a> &#8212; <span class="refentry-description">This function evaluates a chirp signal at time t.</span></li>
+
+
+
+
+
+<li><a href="clustersegment.html" class="refentry">clustersegment</a> &#8212; <span class="refentry-description">This function calculates boundary indexes of clusters of 1’s.</span></li>
+
+
+
+
+
+<li><a href="cmorwavf.html" class="refentry">cmorwavf</a> &#8212; <span class="refentry-description">funcprot(0);</span></li>
+
+
+
+
+
+<li><a href="convmtx.html" class="refentry">convmtx</a> &#8212; <span class="refentry-description">n=double(n);</span></li>
+
+
+
+
+
+<li><a href="corrmtx.html" class="refentry">corrmtx</a> &#8212; <span class="refentry-description">Generate data matrix for autocorrelation matrix estimation</span></li>
+
+
+
+
+
+<li><a href="cummax.html" class="refentry">cummax</a> &#8212; <span class="refentry-description">Cumulative maximum</span></li>
+
+
+
+
+
+<li><a href="cummin.html" class="refentry">cummin</a> &#8212; <span class="refentry-description">Cumulative minimum</span></li>
+
+
+
+
+
+<li><a href="db.html" class="refentry">db</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="db2pow.html" class="refentry">db2pow</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="dctmtx.html" class="refentry">dctmtx</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="decimate.html" class="refentry">decimate</a> &#8212; <span class="refentry-description">rhs = argn(2)</span></li>
+
+
+
+
+
+<li><a href="dftmtx.html" class="refentry">dftmtx</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="diric.html" class="refentry">diric</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="downsample.html" class="refentry">downsample</a> &#8212; <span class="refentry-description">This function downsamples the signal by selecting every nth element.</span></li>
+
+
+
+
+
+<li><a href="dutycycle.html" class="refentry">dutycycle</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="ellip.html" class="refentry">ellip</a> &#8212; <span class="refentry-description">This function generates an elliptic or Cauer filter with rp dB of passband ripple and rs dB of stopband attenuation.</span></li>
+
+
+
+
+
+<li><a href="ellipord.html" class="refentry">ellipord</a> &#8212; <span class="refentry-description">This function computes the minimum filter order of an elliptic filter with the desired response characteristics.</span></li>
+
+
+
+
+
+<li><a href="enbw.html" class="refentry">enbw</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="eqtflength.html" class="refentry">eqtflength</a> &#8212; <span class="refentry-description">Modifies the input vector to give output vectors of the same length</span></li>
+
+
+
+
+
+<li><a href="falltime.html" class="refentry">falltime</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="fftfilt.html" class="refentry">fftfilt</a> &#8212; <span class="refentry-description">Performs FFT-based FIR filtering using overlap-add method</span></li>
+
+
+
+
+
+<li><a href="filternorm.html" class="refentry">filternorm</a> &#8212; <span class="refentry-description">Calculates the L-2 norm or L-infinity norm of a digital filter</span></li>
+
+
+
+
+
+<li><a href="filtfilt.html" class="refentry">filtfilt</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="filtic.html" class="refentry">filtic</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="filtord.html" class="refentry">filtord</a> &#8212; <span class="refentry-description">and denominator coefficients, a.</span></li>
+
+
+
+
+
+<li><a href="firpmord.html" class="refentry">firpmord</a> &#8212; <span class="refentry-description">Parks-McClennan optimal FIR filter order estimation</span></li>
+
+
+
+
+
+<li><a href="firtype.html" class="refentry">firtype</a> &#8212; <span class="refentry-description">if (type(b)~=1) then</span></li>
+
+
+
+
+
+<li><a href="flattopwin.html" class="refentry">flattopwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Flat Top window.</span></li>
+
+
+
+
+
+<li><a href="fracshift.html" class="refentry">fracshift</a> &#8212; <span class="refentry-description">This function shifts the series x supplied as input argument by a number of samples d.</span></li>
+
+
+
+
+
+<li><a href="fwhm.html" class="refentry">fwhm</a> &#8212; <span class="refentry-description">This function computes peak full width at half minimum or at another level of peak minimum for vector or matrix data y supplied as input.</span></li>
+
+
+
+
+
+<li><a href="fwhmjlt.html" class="refentry">fwhmjlt</a> &#8212; <span class="refentry-description">rhs = argn(2)</span></li>
+
+
+
+
+
+<li><a href="gauspuls.html" class="refentry">gauspuls</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="gaussdesign.html" class="refentry">gaussdesign</a> &#8212; <span class="refentry-description">GAUSSDESIGN designs a Gaussian pulse-shaping filter which is a low pass FIR</span></li>
+
+
+
+
+
+<li><a href="gaussian.html" class="refentry">gaussian</a> &#8212; <span class="refentry-description">This function returns a Gaussian convolution window.</span></li>
+
+
+
+
+
+<li><a href="gausswin.html" class="refentry">gausswin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Gaussian window.</span></li>
+
+
+
+
+
+<li><a href="gmonopuls.html" class="refentry">gmonopuls</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="goertzel.html" class="refentry">goertzel</a> &#8212; <span class="refentry-description">Computes DFT using the second order Goertzel Algorithm</span></li>
+
+
+
+
+
+<li><a href="grpdelay.html" class="refentry">grpdelay</a> &#8212; <span class="refentry-description">This function computes the group delay of a filter.</span></li>
+
+
+
+
+
+<li><a href="hann.html" class="refentry">hann</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Hanning window.</span></li>
+
+
+
+
+
+<li><a href="helperHarmonicDistortionAmplifier.html" class="refentry">helperHarmonicDistortionAmplifier</a> &#8212; <span class="refentry-description">helperHarmonicDistortionADC Helper function for HarmonicDistortionExample.m</span></li>
+
+
+
+
+
+<li><a href="icceps.html" class="refentry">icceps</a> &#8212; <span class="refentry-description">ICCEPS computes the inverse cepstrum of a real-valued input. This spectrum</span></li>
+
+
+
+
+
+<li><a href="iirlp2mb.html" class="refentry">iirlp2mb</a> &#8212; <span class="refentry-description">This function does IIR Low Pass Filter to Multiband Filter Transformation.</span></li>
+
+
+
+
+
+<li><a href="impinvar.html" class="refentry">impinvar</a> &#8212; <span class="refentry-description">This function converts analog filter with coefficients b and a to digital, conserving impulse response.</span></li>
+
+
+
+
+
+<li><a href="impz.html" class="refentry">impz</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="impzlength.html" class="refentry">impzlength</a> &#8212; <span class="refentry-description">Impulse response length</span></li>
+
+
+
+
+
+<li><a href="interp.html" class="refentry">interp</a> &#8212; <span class="refentry-description">function y = interp(x, q, n, Wc)</span></li>
+
+
+
+
+
+<li><a href="intfilt.html" class="refentry">intfilt</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="invimpinvar.html" class="refentry">invimpinvar</a> &#8212; <span class="refentry-description">This function converts digital filter with coefficients b and a to analog, conserving impulse response.</span></li>
+
+
+
+
+
+<li><a href="is2rc.html" class="refentry">is2rc</a> &#8212; <span class="refentry-description">Convert inverse sine parameters to reflection coefficients</span></li>
+
+
+
+
+
+<li><a href="isallpass.html" class="refentry">isallpass</a> &#8212; <span class="refentry-description">[nargout,nargin]=argn();</span></li>
+
+
+
+
+
+<li><a href="isfir.html" class="refentry">isfir</a> &#8212; <span class="refentry-description">[nargout,nargin]=argn();</span></li>
+
+
+
+
+
+<li><a href="islinphase.html" class="refentry">islinphase</a> &#8212; <span class="refentry-description">[nargout,nargin]=argn();</span></li>
+
+
+
+
+
+<li><a href="ismaxphase.html" class="refentry">ismaxphase</a> &#8212; <span class="refentry-description">[nargout,nargin]=argn();</span></li>
+
+
+
+
+
+<li><a href="isminphase.html" class="refentry">isminphase</a> &#8212; <span class="refentry-description">[nargout,nargin]=argn();</span></li>
+
+
+
+
+
+<li><a href="isstable.html" class="refentry">isstable</a> &#8212; <span class="refentry-description">SOS matrix corresponds to [bi(1) bi(2) bi(3) ai(1) ai(2) ai(3)].</span></li>
+
+
+
+
+
+<li><a href="kaiser.html" class="refentry">kaiser</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Kaiser window.</span></li>
+
+
+
+
+
+<li><a href="lar2rc.html" class="refentry">lar2rc</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="latc2tf.html" class="refentry">latc2tf</a> &#8212; <span class="refentry-description">Convert lattice filter parameters to transfer function coefficients</span></li>
+
+
+
+
+
+<li><a href="latcfilt.html" class="refentry">latcfilt</a> &#8212; <span class="refentry-description">function [f,g,zo]=latcfilt(k,x,v,zi,dim)</span></li>
+
+
+
+
+
+<li><a href="latcfilt1.html" class="refentry">latcfilt1</a> &#8212; <span class="refentry-description">function [f,g,zo]=latcfilt1(k,v,x,zi)</span></li>
+
+
+
+
+
+<li><a href="levdown.html" class="refentry">levdown</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="levin.html" class="refentry">levin</a> &#8212; <span class="refentry-description">[ar,sigma2,rc]=lev(r)</span></li>
+
+
+
+
+
+<li><a href="levinson.html" class="refentry">levinson</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="lpc.html" class="refentry">lpc</a> &#8212; <span class="refentry-description">Linear prediction filter coefficients</span></li>
+
+
+
+
+
+<li><a href="lsf2poly.html" class="refentry">lsf2poly</a> &#8212; <span class="refentry-description">lsf2poly function convert line spectral frequencies to prediction polynomial.</span></li>
+
+
+
+
+
+<li><a href="mag2db.html" class="refentry">mag2db</a> &#8212; <span class="refentry-description">funcprot(0);</span></li>
+
+
+
+
+
+<li><a href="marcumq.html" class="refentry">marcumq</a> &#8212; <span class="refentry-description">This function computes the generalized Marcum Q function of order m with noncentrality parameter a and argument b.</span></li>
+
+
+
+
+
+<li><a href="medfilt1.html" class="refentry">medfilt1</a> &#8212; <span class="refentry-description">1D median filtering</span></li>
+
+
+
+
+
+<li><a href="mexihat.html" class="refentry">mexihat</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="meyeraux.html" class="refentry">meyeraux</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="midcross.html" class="refentry">midcross</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="modulate.html" class="refentry">modulate</a> &#8212; <span class="refentry-description">Modulates signal according to the modulation method</span></li>
+
+
+
+
+
+<li><a href="morlet.html" class="refentry">morlet</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="movingrms.html" class="refentry">movingrms</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="musicBase.html" class="refentry">musicBase</a> &#8212; <span class="refentry-description">Implements the core of the MUSIC algorithm</span></li>
+
+
+
+
+
+<li><a href="nnls.html" class="refentry">nnls</a> &#8212; <span class="refentry-description">Non Negative Least Squares (nnls) for Ex=f with the constraint x&gt;=0</span></li>
+
+
+
+
+
+<li><a href="nuttallwin.html" class="refentry">nuttallwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Blackman-Harris window.</span></li>
+
+
+
+
+
+<li><a href="parzenwin.html" class="refentry">parzenwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Parzen window.</span></li>
+
+
+
+
+
+<li><a href="pchip.html" class="refentry">pchip</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="pchips.html" class="refentry">pchips</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="peak2peak.html" class="refentry">peak2peak</a> &#8212; <span class="refentry-description">funcprot(0);</span></li>
+
+
+
+
+
+<li><a href="peak2rms.html" class="refentry">peak2rms</a> &#8212; <span class="refentry-description">This function calculates the ratio of peak magnitude to the Root Mean Square(RMS) value.</span></li>
+
+
+
+
+
+<li><a href="peig.html" class="refentry">peig</a> &#8212; <span class="refentry-description">Psuedospectrum using the eigenvector method.</span></li>
+
+
+
+
+
+<li><a href="periodogram.html" class="refentry">periodogram</a> &#8212; <span class="refentry-description">funcprot(0);</span></li>
+
+
+
+
+
+<li><a href="phaseInputParseAs_ab.html" class="refentry">phaseInputParseAs_ab</a> &#8212; <span class="refentry-description">fs=0;</span></li>
+
+
+
+
+
+<li><a href="phaseInputParseAs_sos.html" class="refentry">phaseInputParseAs_sos</a> &#8212; <span class="refentry-description">fs=0;</span></li>
+
+
+
+
+
+<li><a href="phasedelay.html" class="refentry">phasedelay</a> &#8212; <span class="refentry-description">cas variable is 2 if sos form is involved and 1 if direct rational form is given</span></li>
+
+
+
+
+
+<li><a href="phasez.html" class="refentry">phasez</a> &#8212; <span class="refentry-description">cas variable is 2 if sos form is involved and 1 if direct rational form is given</span></li>
+
+
+
+
+
+<li><a href="pmusic.html" class="refentry">pmusic</a> &#8212; <span class="refentry-description">Psuedospectrum using MUSIC algorithm</span></li>
+
+
+
+
+
+<li><a href="poly2ac.html" class="refentry">poly2ac</a> &#8212; <span class="refentry-description">Convert prediction polynomial to autocorrelation sequence.</span></li>
+
+
+
+
+
+<li><a href="poly2lsf.html" class="refentry">poly2lsf</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="poly2rc.html" class="refentry">poly2rc</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="polyscale.html" class="refentry">polyscale</a> &#8212; <span class="refentry-description">errcheck1</span></li>
+
+
+
+
+
+<li><a href="polystab.html" class="refentry">polystab</a> &#8212; <span class="refentry-description">This function stabilizes the polynomial transfer function.</span></li>
+
+
+
+
+
+<li><a href="polyval.html" class="refentry">polyval</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="pow2db.html" class="refentry">pow2db</a> &#8212; <span class="refentry-description">rhs = argn(2)</span></li>
+
+
+
+
+
+<li><a href="primitive.html" class="refentry">primitive</a> &#8212; <span class="refentry-description">This function calculates the primitive of a given function supplied as input.</span></li>
+
+
+
+
+
+<li><a href="prony.html" class="refentry">prony</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="pulseperiod.html" class="refentry">pulseperiod</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="pulsesep.html" class="refentry">pulsesep</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="pulsewidth.html" class="refentry">pulsewidth</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="pulstran.html" class="refentry">pulstran</a> &#8212; <span class="refentry-description">This function generates the signal y = sum(func(t+d,...)) for each d.</span></li>
+
+
+
+
+
+<li><a href="rc2ac.html" class="refentry">rc2ac</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="rc2is.html" class="refentry">rc2is</a> &#8212; <span class="refentry-description">Convert reflection coefficients to inverse sine parameters</span></li>
+
+
+
+
+
+<li><a href="rc2lar.html" class="refentry">rc2lar</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="rc2poly.html" class="refentry">rc2poly</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="rcosdesign.html" class="refentry">rcosdesign</a> &#8212; <span class="refentry-description">RCOSDESIGN computes the raised cosine FIR filter</span></li>
+
+
+
+
+
+<li><a href="rectpuls.html" class="refentry">rectpuls</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="rectwin.html" class="refentry">rectwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a rectangular window.</span></li>
+
+
+
+
+
+<li><a href="resample.html" class="refentry">resample</a> &#8212; <span class="refentry-description">This function resamples in the input sequence x supplied by a factor of p/q.</span></li>
+
+
+
+
+
+<li><a href="residued.html" class="refentry">residued</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="residuez.html" class="refentry">residuez</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="risetime.html" class="refentry">risetime</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="rlevinson.html" class="refentry">rlevinson</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="rms.html" class="refentry">rms</a> &#8212; <span class="refentry-description">convert i/p values to their ascii values if they are of type char</span></li>
+
+
+
+
+
+<li><a href="rooteig.html" class="refentry">rooteig</a> &#8212; <span class="refentry-description">Frequencies and power of sinusoids using eigenvector algorithm</span></li>
+
+
+
+
+
+<li><a href="rootmusic.html" class="refentry">rootmusic</a> &#8212; <span class="refentry-description">Frequencies and power of sinusoids using the root MUSIC algorithm</span></li>
+
+
+
+
+
+<li><a href="rssq.html" class="refentry">rssq</a> &#8212; <span class="refentry-description">This function calculates the square root of the sum of values of input vector IN.</span></li>
+
+
+
+
+
+<li><a href="sampled2continuous.html" class="refentry">sampled2continuous</a> &#8212; <span class="refentry-description">This function calculates the output reconstructed from the samples n supplied as input, at a rate of 1/s samples per unit time.</span></li>
+
+
+
+
+
+<li><a href="sawtooth.html" class="refentry">sawtooth</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="schtrig.html" class="refentry">schtrig</a> &#8212; <span class="refentry-description">This function implements a multisignal Schmitt triggers with lev levels supplied as input.</span></li>
+
+
+
+
+
+<li><a href="schurrc.html" class="refentry">schurrc</a> &#8212; <span class="refentry-description">narginchk(1,1,argn(2));</span></li>
+
+
+
+
+
+<li><a href="seqperiod.html" class="refentry">seqperiod</a> &#8212; <span class="refentry-description">Calculates the period of a sequence</span></li>
+
+
+
+
+
+<li><a href="sgolay.html" class="refentry">sgolay</a> &#8212; <span class="refentry-description">This function computes the filter coefficients for all Savitzsky-Golay smoothing filters.</span></li>
+
+
+
+
+
+<li><a href="sgolayfilt.html" class="refentry">sgolayfilt</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="shanwavf.html" class="refentry">shanwavf</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="shiftdata.html" class="refentry">shiftdata</a> &#8212; <span class="refentry-description">Shifts data by rearranging dimensions</span></li>
+
+
+
+
+
+<li><a href="slewrate.html" class="refentry">slewrate</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="sos2cell.html" class="refentry">sos2cell</a> &#8212; <span class="refentry-description">Converts a second order section matrix to a cell array</span></li>
+
+
+
+
+
+<li><a href="sos2ss.html" class="refentry">sos2ss</a> &#8212; <span class="refentry-description">[nargout,nargin]=argn();</span></li>
+
+
+
+
+
+<li><a href="sos2tf.html" class="refentry">sos2tf</a> &#8212; <span class="refentry-description">This function converts series second-order sections to direct H(z) = B(z)/A(z) form.</span></li>
+
+
+
+
+
+<li><a href="sos2zp.html" class="refentry">sos2zp</a> &#8212; <span class="refentry-description">This function converts series second-order sections to zeros, poles, and gains (pole residues).</span></li>
+
+
+
+
+
+<li><a href="sosbreak.html" class="refentry">sosbreak</a> &#8212; <span class="refentry-description">function for breaking a polynomial in second order polynomials (and an extra linear)</span></li>
+
+
+
+
+
+<li><a href="sosfilt.html" class="refentry">sosfilt</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="specgram.html" class="refentry">specgram</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="ss2sos.html" class="refentry">ss2sos</a> &#8212; <span class="refentry-description">not taking if, order and scale as input since they do not seem useful</span></li>
+
+
+
+
+
+<li><a href="statelevels.html" class="refentry">statelevels</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="stmcb.html" class="refentry">stmcb</a> &#8212; <span class="refentry-description">function [b,a] = stmcb( x, u_in, q, p, niter, a_in )</span></li>
+
+
+
+
+
+<li><a href="strips.html" class="refentry">strips</a> &#8212; <span class="refentry-description">Plots vector or matrix in strips</span></li>
+
+
+
+
+
+<li><a href="subspaceMethodsInputParser.html" class="refentry">subspaceMethodsInputParser</a> &#8212; <span class="refentry-description">Input parser to be used by pmusic and peig</span></li>
+
+
+
+
+
+<li><a href="tf2sos.html" class="refentry">tf2sos</a> &#8212; <span class="refentry-description">This function converts direct-form filter coefficients to series second-order sections.</span></li>
+
+
+
+
+
+<li><a href="tf2zp.html" class="refentry">tf2zp</a> &#8212; <span class="refentry-description">[z,p,k]= tf2zp(b,a);</span></li>
+
+
+
+
+
+<li><a href="tf2zpk.html" class="refentry">tf2zpk</a> &#8212; <span class="refentry-description">form</span></li>
+
+
+
+
+
+<li><a href="transpose.html" class="refentry">transpose</a> &#8212; <span class="refentry-description">funcprot(0);</span></li>
+
+
+
+
+
+<li><a href="trial_iirlp2mb.html" class="refentry">trial_iirlp2mb</a> &#8212; <span class="refentry-description">B = varargin(1)</span></li>
+
+
+
+
+
+<li><a href="triang.html" class="refentry">triang</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a triangular window.</span></li>
+
+
+
+
+
+<li><a href="tripuls.html" class="refentry">tripuls</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="truth.html" class="refentry">truth</a> &#8212; <span class="refentry-description">y = %t</span></li>
+
+
+
+
+
+<li><a href="tukeywin.html" class="refentry">tukeywin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Tukey window.</span></li>
+
+
+
+
+
+<li><a href="udecode.html" class="refentry">udecode</a> &#8212; <span class="refentry-description">Decodes the input uniformly quantized values</span></li>
+
+
+
+
+
+<li><a href="uencode.html" class="refentry">uencode</a> &#8212; <span class="refentry-description">Performs uniform quantization of the input into 2^n levels</span></li>
+
+
+
+
+
+<li><a href="ultrwin.html" class="refentry">ultrwin</a> &#8212; <span class="refentry-description">This function returns the coefficients of an Ultraspherical window.</span></li>
+
+
+
+
+
+<li><a href="unshiftdata.html" class="refentry">unshiftdata</a> &#8212; <span class="refentry-description">Inverts the effect of shiftdata</span></li>
+
+
+
+
+
+<li><a href="upfirdn.html" class="refentry">upfirdn</a> &#8212; <span class="refentry-description">This function upsamples the input data, applies the FIR filter and then downsamples it.</span></li>
+
+
+
+
+
+<li><a href="upsample.html" class="refentry">upsample</a> &#8212; <span class="refentry-description">This function upsamples the signal, inserting n-1 zeros between every element.</span></li>
+
+
+
+
+
+<li><a href="upsamplefill.html" class="refentry">upsamplefill</a> &#8212; <span class="refentry-description">This function upsamples a vector interleaving given values or copies of the vector elements.</span></li>
+
+
+
+
+
+<li><a href="var.html" class="refentry">var</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="vco.html" class="refentry">vco</a> &#8212; <span class="refentry-description">Voltage Controlled Oscillator</span></li>
+
+
+
+
+
+<li><a href="welchwin.html" class="refentry">welchwin</a> &#8212; <span class="refentry-description">This function returns the filter coefficients of a Welch window.</span></li>
+
+
+
+
+
+<li><a href="window.html" class="refentry">window</a> &#8212; <span class="refentry-description">This function creates an m-point window from the function f given as input.</span></li>
+
+
+
+
+
+<li><a href="wkeep.html" class="refentry">wkeep</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="wrev.html" class="refentry">wrev</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="xcorr2.html" class="refentry">xcorr2</a> &#8212; <span class="refentry-description"></span></li>
+
+
+
+
+
+<li><a href="zerocrossing.html" class="refentry">zerocrossing</a> &#8212; <span class="refentry-description">This function estimates the points at which a given waveform crosses the x-axis.</span></li>
+
+
+
+
+
+<li><a href="zp2sos.html" class="refentry">zp2sos</a> &#8212; <span class="refentry-description">This function converts filter poles and zeros to second-order sections.</span></li>
+
+
+
+
+
+<li><a href="zplane.html" class="refentry">zplane</a> &#8212; <span class="refentry-description">funcprot(0);</span></li></ul>
+ <br />
+
+ <div class="manualnavbar">
+ <table width="100%">
+ <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
+<tr>
+ <td width="30%">
+
+ </td>
+ <td width="40%" class="center">
+ <span class="top"><a href="index.html">FOSSEE Signal Processing Toolbox</a></span>
+
+ </td>
+ <td width="30%" class="next">
+
+ </td>
+ </tr></table>
+ <hr />
+ </div>
+ </body>
+</html>
diff --git a/help/en_US/scilab_en_US_help/seqperiod.html b/help/en_US/scilab_en_US_help/seqperiod.html
index 051be78..424df48 100644
--- a/help/en_US/scilab_en_US_help/seqperiod.html
+++ b/help/en_US/scilab_en_US_help/seqperiod.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; seqperiod</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; seqperiod</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">seqperiod</h1>
@@ -91,7 +99,11 @@ If x is a matrix or n-dimesnional array, the function operates along the first n
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sgolay.html b/help/en_US/scilab_en_US_help/sgolay.html
index e7bee72..3293952 100644
--- a/help/en_US/scilab_en_US_help/sgolay.html
+++ b/help/en_US/scilab_en_US_help/sgolay.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sgolay</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sgolay</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sgolay</h1>
@@ -73,7 +81,11 @@ m can be used in order to get directly the mth derivative; ts is a scaling facto
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sgolayfilt.html b/help/en_US/scilab_en_US_help/sgolayfilt.html
index 506a4b3..2354da3 100644
--- a/help/en_US/scilab_en_US_help/sgolayfilt.html
+++ b/help/en_US/scilab_en_US_help/sgolayfilt.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sgolayfilt</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sgolayfilt</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sgolayfilt</h1>
@@ -82,7 +90,11 @@ ts is the dimenstion along which the filter operates. If not specified, the func
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/shanwavf.html b/help/en_US/scilab_en_US_help/shanwavf.html
index 406b00c..afaf240 100644
--- a/help/en_US/scilab_en_US_help/shanwavf.html
+++ b/help/en_US/scilab_en_US_help/shanwavf.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; shanwavf</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; shanwavf</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">shanwavf</h1>
@@ -74,7 +82,11 @@ This function implements the complex Shannon wavelet function and returns the va
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/shiftdata.html b/help/en_US/scilab_en_US_help/shiftdata.html
index 041ef0d..22d0ac0 100644
--- a/help/en_US/scilab_en_US_help/shiftdata.html
+++ b/help/en_US/scilab_en_US_help/shiftdata.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; shiftdata</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; shiftdata</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">shiftdata</h1>
@@ -104,7 +112,11 @@ Shifts the entries along dimension dim in x to the first column and returns the
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/slewrate.html b/help/en_US/scilab_en_US_help/slewrate.html
index a50893c..1246041 100644
--- a/help/en_US/scilab_en_US_help/slewrate.html
+++ b/help/en_US/scilab_en_US_help/slewrate.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; slewrate</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; slewrate</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">slewrate</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sos2cell.html b/help/en_US/scilab_en_US_help/sos2cell.html
index 4bb7dfe..fe57832 100644
--- a/help/en_US/scilab_en_US_help/sos2cell.html
+++ b/help/en_US/scilab_en_US_help/sos2cell.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2cell</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2cell</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sos2cell</h1>
@@ -82,7 +90,11 @@ Ankur Mallick</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sos2ss.html b/help/en_US/scilab_en_US_help/sos2ss.html
index 214563f..1a24ce2 100644
--- a/help/en_US/scilab_en_US_help/sos2ss.html
+++ b/help/en_US/scilab_en_US_help/sos2ss.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2ss</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2ss</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sos2ss</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sos2tf.html b/help/en_US/scilab_en_US_help/sos2tf.html
index 4764b86..fc68d11 100644
--- a/help/en_US/scilab_en_US_help/sos2tf.html
+++ b/help/en_US/scilab_en_US_help/sos2tf.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2tf</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2tf</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sos2tf</h1>
@@ -70,7 +78,11 @@ The output is a vector.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sos2zp.html b/help/en_US/scilab_en_US_help/sos2zp.html
index bd6e825..b452718 100644
--- a/help/en_US/scilab_en_US_help/sos2zp.html
+++ b/help/en_US/scilab_en_US_help/sos2zp.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2zp</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sos2zp</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sos2zp</h1>
@@ -78,7 +86,11 @@ The outputs are z, p, k. z and p are column vectors containing zeros and poles r
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sosbreak.html b/help/en_US/scilab_en_US_help/sosbreak.html
index 5d2e144..5cf31cd 100644
--- a/help/en_US/scilab_en_US_help/sosbreak.html
+++ b/help/en_US/scilab_en_US_help/sosbreak.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sosbreak</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sosbreak</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sosbreak</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/sosfilt.html b/help/en_US/scilab_en_US_help/sosfilt.html
index 9494a6a..5dc3121 100644
--- a/help/en_US/scilab_en_US_help/sosfilt.html
+++ b/help/en_US/scilab_en_US_help/sosfilt.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; sosfilt</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; sosfilt</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">sosfilt</h1>
@@ -65,7 +73,11 @@ Second order section digital filter sos is applied to the input vector and the o
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/specgram.html b/help/en_US/scilab_en_US_help/specgram.html
index 6c53188..6437c17 100644
--- a/help/en_US/scilab_en_US_help/specgram.html
+++ b/help/en_US/scilab_en_US_help/specgram.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; specgram</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; specgram</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">specgram</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/ss2sos.html b/help/en_US/scilab_en_US_help/ss2sos.html
index 2b02c99..64e0859 100644
--- a/help/en_US/scilab_en_US_help/ss2sos.html
+++ b/help/en_US/scilab_en_US_help/ss2sos.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; ss2sos</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; ss2sos</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">ss2sos</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/statelevels.html b/help/en_US/scilab_en_US_help/statelevels.html
index 372b7ab..dc8124a 100644
--- a/help/en_US/scilab_en_US_help/statelevels.html
+++ b/help/en_US/scilab_en_US_help/statelevels.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; statelevels</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; statelevels</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">statelevels</h1>
@@ -83,7 +91,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/stmcb.html b/help/en_US/scilab_en_US_help/stmcb.html
index b80e5b8..77c5a1c 100644
--- a/help/en_US/scilab_en_US_help/stmcb.html
+++ b/help/en_US/scilab_en_US_help/stmcb.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; stmcb</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; stmcb</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">stmcb</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/strips.html b/help/en_US/scilab_en_US_help/strips.html
index 955a3ea..f443b8a 100644
--- a/help/en_US/scilab_en_US_help/strips.html
+++ b/help/en_US/scilab_en_US_help/strips.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; strips</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; strips</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">strips</h1>
@@ -71,7 +79,11 @@ Ankur Mallick</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/subspaceMethodsInputParser.html b/help/en_US/scilab_en_US_help/subspaceMethodsInputParser.html
index 9414cb7..cfc0852 100644
--- a/help/en_US/scilab_en_US_help/subspaceMethodsInputParser.html
+++ b/help/en_US/scilab_en_US_help/subspaceMethodsInputParser.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; subspaceMethodsInputParser</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; subspaceMethodsInputParser</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">subspaceMethodsInputParser</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/tf2sos.html b/help/en_US/scilab_en_US_help/tf2sos.html
index f158042..6ac2d3f 100644
--- a/help/en_US/scilab_en_US_help/tf2sos.html
+++ b/help/en_US/scilab_en_US_help/tf2sos.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; tf2sos</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; tf2sos</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">tf2sos</h1>
@@ -70,7 +78,11 @@ If there is only one output argument, the overall filter gain is applied to the
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/tf2zp.html b/help/en_US/scilab_en_US_help/tf2zp.html
index d9ce8fe..bcbc434 100644
--- a/help/en_US/scilab_en_US_help/tf2zp.html
+++ b/help/en_US/scilab_en_US_help/tf2zp.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; tf2zp</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; tf2zp</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">tf2zp</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/tf2zpk.html b/help/en_US/scilab_en_US_help/tf2zpk.html
index 6d5c64c..8f65974 100644
--- a/help/en_US/scilab_en_US_help/tf2zpk.html
+++ b/help/en_US/scilab_en_US_help/tf2zpk.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; tf2zpk</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; tf2zpk</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">tf2zpk</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/transpose.html b/help/en_US/scilab_en_US_help/transpose.html
index e600f76..5a29278 100644
--- a/help/en_US/scilab_en_US_help/transpose.html
+++ b/help/en_US/scilab_en_US_help/transpose.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; transpose</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; transpose</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">transpose</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/trial_iirlp2mb.html b/help/en_US/scilab_en_US_help/trial_iirlp2mb.html
index 3127d20..9990e9e 100644
--- a/help/en_US/scilab_en_US_help/trial_iirlp2mb.html
+++ b/help/en_US/scilab_en_US_help/trial_iirlp2mb.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; trial_iirlp2mb</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; trial_iirlp2mb</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">trial_iirlp2mb</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/triang.html b/help/en_US/scilab_en_US_help/triang.html
index b6dd1d8..c56e6fc 100644
--- a/help/en_US/scilab_en_US_help/triang.html
+++ b/help/en_US/scilab_en_US_help/triang.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; triang</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; triang</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">triang</h1>
@@ -68,7 +76,11 @@ This function returns the filter coefficients of a triangular window of length m
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/tripuls.html b/help/en_US/scilab_en_US_help/tripuls.html
index 15dbeef..95aa57e 100644
--- a/help/en_US/scilab_en_US_help/tripuls.html
+++ b/help/en_US/scilab_en_US_help/tripuls.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; tripuls</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; tripuls</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">tripuls</h1>
@@ -70,7 +78,11 @@ The value of skew represents the relative placement of the peak in the given wid
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/truth.html b/help/en_US/scilab_en_US_help/truth.html
index 079f98c..7e1c716 100644
--- a/help/en_US/scilab_en_US_help/truth.html
+++ b/help/en_US/scilab_en_US_help/truth.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; truth</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; truth</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">truth</h1>
@@ -45,7 +53,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/tukeywin.html b/help/en_US/scilab_en_US_help/tukeywin.html
index a6868ae..368cfdc 100644
--- a/help/en_US/scilab_en_US_help/tukeywin.html
+++ b/help/en_US/scilab_en_US_help/tukeywin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; tukeywin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; tukeywin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">tukeywin</h1>
@@ -70,7 +78,11 @@ The second parameter r defines the ratio between the constant and cosine section
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/udecode.html b/help/en_US/scilab_en_US_help/udecode.html
index f24f31a..e0dcc97 100644
--- a/help/en_US/scilab_en_US_help/udecode.html
+++ b/help/en_US/scilab_en_US_help/udecode.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; udecode</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; udecode</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">udecode</h1>
@@ -72,7 +80,11 @@ Ankur Mallick
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/uencode.html b/help/en_US/scilab_en_US_help/uencode.html
index e3bf784..fcffc73 100644
--- a/help/en_US/scilab_en_US_help/uencode.html
+++ b/help/en_US/scilab_en_US_help/uencode.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; uencode</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; uencode</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">uencode</h1>
@@ -73,7 +81,11 @@ References
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/ultrwin.html b/help/en_US/scilab_en_US_help/ultrwin.html
index 6cf79d8..3a94519 100644
--- a/help/en_US/scilab_en_US_help/ultrwin.html
+++ b/help/en_US/scilab_en_US_help/ultrwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; ultrwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; ultrwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">ultrwin</h1>
@@ -78,7 +86,11 @@ The value of xmu is also returned for given beta, att or latt.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/unshiftdata.html b/help/en_US/scilab_en_US_help/unshiftdata.html
index 56c56f3..8a114ec 100644
--- a/help/en_US/scilab_en_US_help/unshiftdata.html
+++ b/help/en_US/scilab_en_US_help/unshiftdata.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; unshiftdata</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; unshiftdata</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">unshiftdata</h1>
@@ -108,7 +116,11 @@ Applies the permutation perm or number of shifts nshifts on x to invert shiftdat
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/upfirdn.html b/help/en_US/scilab_en_US_help/upfirdn.html
index 3c8bdd3..31f6c2d 100644
--- a/help/en_US/scilab_en_US_help/upfirdn.html
+++ b/help/en_US/scilab_en_US_help/upfirdn.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; upfirdn</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; upfirdn</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">upfirdn</h1>
@@ -69,7 +77,11 @@ This function upsamples the input data in the matrix by a factor of n. Then the
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/upsample.html b/help/en_US/scilab_en_US_help/upsample.html
index edeed52..7240ca9 100644
--- a/help/en_US/scilab_en_US_help/upsample.html
+++ b/help/en_US/scilab_en_US_help/upsample.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; upsample</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; upsample</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">upsample</h1>
@@ -68,7 +76,11 @@ The phase determines the position of the inserted sample in the block of zeros.
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/upsamplefill.html b/help/en_US/scilab_en_US_help/upsamplefill.html
index 32db503..1a262e5 100644
--- a/help/en_US/scilab_en_US_help/upsamplefill.html
+++ b/help/en_US/scilab_en_US_help/upsamplefill.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; upsamplefill</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; upsamplefill</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">upsamplefill</h1>
@@ -69,7 +77,11 @@ The third argument, if true, means that w should be scalar and that each value i
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/var.html b/help/en_US/scilab_en_US_help/var.html
index 418f65e..c5916aa 100644
--- a/help/en_US/scilab_en_US_help/var.html
+++ b/help/en_US/scilab_en_US_help/var.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; var</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; var</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">var</h1>
@@ -61,7 +69,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/vco.html b/help/en_US/scilab_en_US_help/vco.html
index b425fc6..66c1178 100644
--- a/help/en_US/scilab_en_US_help/vco.html
+++ b/help/en_US/scilab_en_US_help/vco.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; vco</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; vco</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">vco</h1>
@@ -73,7 +81,11 @@ Ankur Mallick</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/welchwin.html b/help/en_US/scilab_en_US_help/welchwin.html
index 15a676f..2a3fe6f 100644
--- a/help/en_US/scilab_en_US_help/welchwin.html
+++ b/help/en_US/scilab_en_US_help/welchwin.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; welchwin</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; welchwin</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">welchwin</h1>
@@ -72,7 +80,11 @@ For symmetric, the length should be an integer&gt;2. For periodic, the length sh
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/window.html b/help/en_US/scilab_en_US_help/window.html
index e05bad6..3caaeb7 100644
--- a/help/en_US/scilab_en_US_help/window.html
+++ b/help/en_US/scilab_en_US_help/window.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; window</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; window</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">window</h1>
@@ -74,7 +82,11 @@ f can take any valid function as a string, for example &#0034;blackmanharris&#00
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/wkeep.html b/help/en_US/scilab_en_US_help/wkeep.html
index b351ed0..d9f319a 100644
--- a/help/en_US/scilab_en_US_help/wkeep.html
+++ b/help/en_US/scilab_en_US_help/wkeep.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; wkeep</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; wkeep</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">wkeep</h1>
@@ -69,7 +77,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/wrev.html b/help/en_US/scilab_en_US_help/wrev.html
index 2984f3c..dad5fab 100644
--- a/help/en_US/scilab_en_US_help/wrev.html
+++ b/help/en_US/scilab_en_US_help/wrev.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; wrev</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; wrev</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">wrev</h1>
@@ -63,7 +71,11 @@ This function reverses the order of elements of the input vector x.</p></div>
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/xcorr2.html b/help/en_US/scilab_en_US_help/xcorr2.html
index 70108ec..541398f 100644
--- a/help/en_US/scilab_en_US_help/xcorr2.html
+++ b/help/en_US/scilab_en_US_help/xcorr2.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; xcorr2</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; xcorr2</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">xcorr2</h1>
@@ -51,7 +59,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/zerocrossing.html b/help/en_US/scilab_en_US_help/zerocrossing.html
index 1f6653e..0eb00dd 100644
--- a/help/en_US/scilab_en_US_help/zerocrossing.html
+++ b/help/en_US/scilab_en_US_help/zerocrossing.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; zerocrossing</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; zerocrossing</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">zerocrossing</h1>
@@ -64,7 +72,11 @@ This function estimates the points at which a given waveform y = y(w) crosses th
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/zp2sos.html b/help/en_US/scilab_en_US_help/zp2sos.html
index 18318a5..b9cbd68 100644
--- a/help/en_US/scilab_en_US_help/zp2sos.html
+++ b/help/en_US/scilab_en_US_help/zp2sos.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -29,7 +33,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; zp2sos</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; zp2sos</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">zp2sos</h1>
@@ -73,7 +81,11 @@ If there is only one output argument, the overall filter gain is applied to the
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/zplane.html b/help/en_US/scilab_en_US_help/zplane.html
index 672c7f8..e3cde1f 100644
--- a/help/en_US/scilab_en_US_help/zplane.html
+++ b/help/en_US/scilab_en_US_help/zplane.html
@@ -16,7 +16,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
@@ -28,7 +32,11 @@
+<<<<<<< HEAD
<span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a> &gt; zplane</span>
+=======
+ <span class="path"><a href="index.html">FOSSEE Signal Processing Toolbox</a> &gt;&gt; <a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a> &gt; zplane</span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
<br /><br />
<div class="refnamediv"><h1 class="refname">zplane</h1>
@@ -44,7 +52,11 @@
</td>
<td width="40%" class="center">
+<<<<<<< HEAD
<span class="top"><a href="section_5118e822ecc2888aa80042108de4932e.html">FOSSEE Signal Processing Toolbox</a></span>
+=======
+ <span class="top"><a href="section_cc2bc01c47967d47fcf3507a91d572ba.html">FOSSEE Signal Processing Toolbox</a></span>
+>>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27
</td>
<td width="30%" class="next">
diff --git a/macros/cceps.bin b/macros/cceps.bin
new file mode 100644
index 0000000..cda9e36
--- /dev/null
+++ b/macros/cceps.bin
Binary files differ
diff --git a/macros/cceps.sci b/macros/cceps.sci
new file mode 100644
index 0000000..99e4a7d
--- /dev/null
+++ b/macros/cceps.sci
@@ -0,0 +1,16 @@
+function y = cceps (x,correct)
+
+funcprot(0);
+//
+rhs = argn(2)
+if(rhs<1 | rhs>2)
+error("Wrong number of input arguments.")
+end
+
+ select(rhs)
+ case 1 then
+ y = callOctave("cceps",x)
+ case 2 then
+ y = callOctave("cceps",x,correct)
+ end
+endfunction
diff --git a/macros/fht.bin b/macros/fht.bin
new file mode 100644
index 0000000..e97d7e4
--- /dev/null
+++ b/macros/fht.bin
Binary files differ
diff --git a/macros/fht.sci b/macros/fht.sci
new file mode 100644
index 0000000..c6fd1bd
--- /dev/null
+++ b/macros/fht.sci
@@ -0,0 +1,16 @@
+function y=fht(d,n,dim)
+funcprot(0);
+rhs=argn(2);
+if(rhs<1 | rhs>3)
+ error("Wrong number of input arguments.")
+end
+select(rhs)
+case 1 then
+ y=callOctave("fht",d)
+case 2 then
+ y=callOctave("fht",d,n)
+case 3 then
+ y=callOctave("fht",d,n,dim)
+end
+
+endfunction
diff --git a/macros/idct1.bin b/macros/idct1.bin
new file mode 100644
index 0000000..3ef1c7e
--- /dev/null
+++ b/macros/idct1.bin
Binary files differ
diff --git a/macros/idct1.sci b/macros/idct1.sci
new file mode 100644
index 0000000..d398e56
--- /dev/null
+++ b/macros/idct1.sci
@@ -0,0 +1,14 @@
+function y = idct1(x,n)
+funcprot(0);
+rhs=argn(2)
+if (rhs<1 | rhs>2) then
+ error("Wrong number of input arguments.")
+end
+select(rhs)
+case 1 then
+ y=callOctave("idct",x)
+case 2 then
+ y=callOctave("idct",x,n)
+end
+
+endfunction
diff --git a/macros/idct2.bin b/macros/idct2.bin
new file mode 100644
index 0000000..d577764
--- /dev/null
+++ b/macros/idct2.bin
Binary files differ
diff --git a/macros/idct2.sci b/macros/idct2.sci
new file mode 100644
index 0000000..1cfacab
--- /dev/null
+++ b/macros/idct2.sci
@@ -0,0 +1,15 @@
+function y = idct2(x,varargin)
+funcprot(0);
+rhs=argn(2)
+if (rhs<1 | rhs>3) then
+ error("Wrong number of input arguments.")
+end
+select(rhs)
+case 1 then
+ y=callOctave("idct2",x)
+case 2 then
+ y=callOctave("idct2",x,varargin(1))
+case 3 then
+ y=callOctave("idct2",x,varargin(1),varargin(2))
+end
+endfunction
diff --git a/macros/idst1.bin b/macros/idst1.bin
new file mode 100644
index 0000000..448ee7e
--- /dev/null
+++ b/macros/idst1.bin
Binary files differ
diff --git a/macros/idst1.sci b/macros/idst1.sci
new file mode 100644
index 0000000..5276a70
--- /dev/null
+++ b/macros/idst1.sci
@@ -0,0 +1,14 @@
+function y = idst1(x,varargin)
+funcprot(0);
+rhs=argn(2);
+if(rhs<1 | rhs>2) then
+ error("Wrong number of input arguments.");
+end
+select(rhs)
+case 1 then
+ y=callOctave("idst",x);
+case 2 then
+ y=callOctave("idst",x,varargin(1));
+end
+
+endfunction
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
diff --git a/macros/sigmoid_train.bin b/macros/sigmoid_train.bin
new file mode 100644
index 0000000..438d657
--- /dev/null
+++ b/macros/sigmoid_train.bin
Binary files differ
diff --git a/macros/sigmoid_train.sci b/macros/sigmoid_train.sci
new file mode 100644
index 0000000..bba751d
--- /dev/null
+++ b/macros/sigmoid_train.sci
@@ -0,0 +1,12 @@
+function y =sigmoid_train(t, ranges, rc)
+funcprot(0);
+rhs=argn(2);
+if (rhs<3 | rhs>3) then
+ error("Wrong number of input arguments");
+end
+
+select(rhs)
+case 3 then
+ y=callOctave("sigmoid_train", t, ranges, rc)
+end
+endfunction
diff --git a/macros/xcov1.bin b/macros/xcov1.bin
new file mode 100644
index 0000000..9a57ca5
--- /dev/null
+++ b/macros/xcov1.bin
Binary files differ
diff --git a/macros/xcov1.sci b/macros/xcov1.sci
new file mode 100644
index 0000000..4c1f37e
--- /dev/null
+++ b/macros/xcov1.sci
@@ -0,0 +1,17 @@
+function [R,lag] = xcov1(X, Y, biasflag)
+
+funcprot(0);
+rhs = argn(2)
+if(rhs<1 | rhs>3)
+error("Wrong number of input arguments.");
+end
+
+ select(rhs)
+ case 1 then
+ [R,lag] = callOctave("xcov",X);
+ case 2 then
+ [R,lag] = callOctave("xcov",X,Y);
+ case 3 then
+ [R,lag] = callOctave("xcov",X,Y,biasflag);
+ end
+endfunction