diff options
Diffstat (limited to 'help/en_US/scilab_en_US_help')
| -rw-r--r-- | help/en_US/scilab_en_US_help/jhelpidx.xml | 3 | ||||
| -rw-r--r-- | help/en_US/scilab_en_US_help/jhelpmap.jhm | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/help/en_US/scilab_en_US_help/jhelpidx.xml b/help/en_US/scilab_en_US_help/jhelpidx.xml deleted file mode 100644 index aa5a66e2..00000000 --- a/help/en_US/scilab_en_US_help/jhelpidx.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 1.0//EN" "http://java.sun.com/products/javahelp/index_1_0.dtd"> -<index version="1.0"/>
\ No newline at end of file diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index f4fd3177..a97448b6 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_009504e67ab100d6991ada9db2f321bb" url="section_009504e67ab100d6991ada9db2f321bb.html"/> +======= +<mapID target="section_35ee3b19a97c75b084122c05ac0777c6" url="section_35ee3b19a97c75b084122c05ac0777c6.html"/> +>>>>>>> 8106d4ce6960cfd63c3a42171fdf5d52e46ccb06 <mapID target="AVRADCSetup" url="AVRADCSetup.html"/> <mapID target="AVRDigitalIn" url="AVRDigitalIn.html"/> <mapID target="AVRDigitalOut" url="AVRDigitalOut.html"/> |