From 7e43ae8d200a7da15ad458f5bb83582d0e389ce7 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Mon, 27 Nov 2017 16:40:37 +0530 Subject: Merge --- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 23582 -> 13071 bytes .../scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 3723 -> 1735 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 1518 -> 834 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 100456 -> 56223 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 26760 -> 26624 bytes help/en_US/scilab_en_US_help/jhelpmap.jhm | 1 + help/en_US/scilab_en_US_help/jhelptoc.xml | 1 + 8 files changed, 3 insertions(+), 1 deletion(-) (limited to 'help/en_US/scilab_en_US_help') diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 1c0a160..3105019 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index 8b4ef1f..16c3c1b 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index 44b7b1f..0fd7aff 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS index 2f0feea..5d4fac0 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index 677736a..e6c083a 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=1967 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=2335 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index 067ca95..ea3dfe8 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index add47c8..ac7ff93 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -83,6 +83,7 @@ + diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index 4db2aa2..dda12cb 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -83,6 +83,7 @@ + -- cgit From 9539b5efb5ccf665a1cc4b8e814e96460b22e0ab Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Tue, 28 Nov 2017 14:53:58 +0530 Subject: New functions and help files generated --- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 13071 -> 13367 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 1735 -> 1769 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | 14 +++++++------- .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 56223 -> 57620 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 26624 -> 28672 bytes help/en_US/scilab_en_US_help/jhelpmap.jhm | 2 ++ help/en_US/scilab_en_US_help/jhelptoc.xml | 2 ++ 8 files changed, 12 insertions(+), 8 deletions(-) (limited to 'help/en_US/scilab_en_US_help') diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 3105019..2e55114 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index 16c3c1b..ac87aca 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index 0fd7aff..ae19610 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS @@ -1,7 +1,7 @@ -j !(hC(p,AlZs挭t9rGA&ݔxXHʌTM<52TJQ; 0@VCE(CF=#3o3Qg0S[c;b1Y޸e(ƲchVeGE1PQ#'e[rj;VMH'!ni3 -%+ Q欙}wUٗ8܅ Ԙ -MgǏ6H͕*T5&1e2TvKS*e`U;bnVD**|! -#BуyV)`wΘÖuy2yWl4KréPywF-E*E ZbMlAr{T?˝:z(FȊ24`HR9"m%P,RtRI ΢G)W1K -4I9Ch̩>Vd-5ޱ|31 F8^X 4Coٿx$3c{w~qDEk]Si KGon}Rh84R;Y;+*bYkS}K_lN(~lR~oB<;tioUCpKdkOHBĜ{!W _g'ZdHf+[%Vjv/e>Yի8]}i'pV>+3a -ݷNFe[6YKIJ1-5 -o#[I. PTH9`k֜u/\=Jp!eI4e9^8)R2-O LeDq$#Ih,PQi(H ь,4eL3rء{*Vw#J1Ś9G5oF,QGQhci2T1b3d k[rj;VMH'!ni3 + T,9F˚eWj`c$Q`I6}T%tV0ԘKMd_˕SدYLIїu<9/[TRUM?#|T]k(HK= F Z +83^,E/>bdVDa72_v &/K~MC~xMd㨨=5i3÷ɱ9SxNr.u*"Ե"*lс# Kq^4:22ٴaCIJW'˝ +c|R1q Q{☜ +4I9Ch̩>Vd-5ޱ|32]F_U 66)9JWwnt}Ͽ`GfL w̯IeX7,ҚL#+翘*ұʷ* $f<'?4;^ZWnh7!mZ&45,XV"KI{G7mDj^mQGq +ߋUZ; zn{uk,TX rNo6j"KֳA1-7u5y+p\EI3.RH94R}A$.w_K \ No newline at end of file diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS index 5d4fac0..4544947 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index e6c083a..7d65376 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=2335 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=2382 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index ea3dfe8..6337674 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index ac7ff93..4e2930e 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -7,6 +7,7 @@ + @@ -49,6 +50,7 @@ + diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index dda12cb..1b4fbc8 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -7,6 +7,7 @@ + @@ -49,6 +50,7 @@ + -- cgit From d97df53d72f66db206da540e909679fa863b51b6 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Wed, 29 Nov 2017 17:34:00 +0530 Subject: Added xml files and new functions --- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 13367 -> 14195 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 1769 -> 1885 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 844 -> 874 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 57620 -> 61423 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 28672 -> 28672 bytes help/en_US/scilab_en_US_help/jhelpmap.jhm | 8 ++++++++ help/en_US/scilab_en_US_help/jhelptoc.xml | 8 ++++++++ 8 files changed, 17 insertions(+), 1 deletion(-) (limited to 'help/en_US/scilab_en_US_help') diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 2e55114..a84edbe 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index ac87aca..f9a9626 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index ae19610..8255fa1 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS index 4544947..80cb637 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index 7d65376..8970d6a 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=2382 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=2513 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index 6337674..ed7ae27 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index 4e2930e..b4c824f 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -6,6 +6,7 @@ + @@ -15,6 +16,7 @@ + @@ -40,6 +42,7 @@ + @@ -52,9 +55,11 @@ + + @@ -65,6 +70,7 @@ + @@ -74,6 +80,7 @@ + @@ -97,6 +104,7 @@ + diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index 1b4fbc8..5d9607e 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -6,6 +6,7 @@ + @@ -15,6 +16,7 @@ + @@ -40,6 +42,7 @@ + @@ -52,9 +55,11 @@ + + @@ -65,6 +70,7 @@ + @@ -74,6 +80,7 @@ + @@ -97,6 +104,7 @@ + -- cgit From 78b93a6cdf04aa8c861d4580eec8e4839bb8a255 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Thu, 30 Nov 2017 12:05:04 +0530 Subject: TFE function added --- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 14195 -> 14359 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 1885 -> 1887 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 874 -> 877 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 61423 -> 62365 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 28672 -> 28672 bytes help/en_US/scilab_en_US_help/jhelpmap.jhm | 1 + help/en_US/scilab_en_US_help/jhelptoc.xml | 1 + 8 files changed, 3 insertions(+), 1 deletion(-) (limited to 'help/en_US/scilab_en_US_help') diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index a84edbe..f80938d 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index f9a9626..78a675f 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index 8255fa1..11f7b63 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS index 80cb637..a921a9b 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index 8970d6a..a8a67ce 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=2513 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=2516 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index ed7ae27..8273b39 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index b4c824f..88502e4 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -223,6 +223,7 @@ + diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index 5d9607e..56617b9 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -223,6 +223,7 @@ + -- cgit From c257cd7a7e766fb89332cca4fb367904767362ed Mon Sep 17 00:00:00 2001 From: Brijeshcr Date: Thu, 30 Nov 2017 18:27:20 +0530 Subject: Help files and functions --- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 11007 -> 13715 bytes .../scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 1499 -> 1836 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 687 -> 873 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 46489 -> 56855 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 24576 -> 28672 bytes help/en_US/scilab_en_US_help/jhelpmap.jhm | 59 +++++++++++++++++++-- help/en_US/scilab_en_US_help/jhelptoc.xml | 59 +++++++++++++++++++-- 8 files changed, 111 insertions(+), 9 deletions(-) (limited to 'help/en_US/scilab_en_US_help') diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 5485e84..fa8536e 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index 90f6c0f..28b7820 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index 1cfd696..6cdcd55 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS index 77ece74..5da6a95 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index cdbc5eb..815b507 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=1968 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=2491 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index 775f37b..58d9d44 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index dc549a4..9f5590a 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -2,20 +2,19 @@ -<<<<<<< HEAD -======= - ->>>>>>> 9f6962b19c4a5fa76f7525a72faabb1b754712ad + + + @@ -24,23 +23,31 @@ + + + + + + + + @@ -48,13 +55,19 @@ + + + + + + @@ -63,8 +76,10 @@ + + @@ -74,13 +89,25 @@ + + + + + + + + + + + + @@ -90,6 +117,7 @@ + @@ -109,13 +137,16 @@ + + + @@ -136,13 +167,17 @@ + + + + @@ -157,10 +192,14 @@ + + + + @@ -169,14 +208,20 @@ + + + + + + @@ -192,12 +237,18 @@ + + + + + + \ No newline at end of file diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index f1e0621..b84b3cd 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -2,20 +2,19 @@ -<<<<<<< HEAD -======= - ->>>>>>> 9f6962b19c4a5fa76f7525a72faabb1b754712ad + + + @@ -24,23 +23,31 @@ + + + + + + + + @@ -48,13 +55,19 @@ + + + + + + @@ -63,8 +76,10 @@ + + @@ -74,13 +89,25 @@ + + + + + + + + + + + + @@ -90,6 +117,7 @@ + @@ -109,13 +137,16 @@ + + + @@ -136,13 +167,17 @@ + + + + @@ -157,10 +192,14 @@ + + + + @@ -169,14 +208,20 @@ + + + + + + @@ -192,13 +237,19 @@ + + + + + + -- cgit