diff options
Diffstat (limited to '2.3-1/demos/scilab2c.dem.gateway.sce')
| -rw-r--r-- | 2.3-1/demos/scilab2c.dem.gateway.sce | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/2.3-1/demos/scilab2c.dem.gateway.sce b/2.3-1/demos/scilab2c.dem.gateway.sce index 38f7fdc7..e9a83bf0 100644 --- a/2.3-1/demos/scilab2c.dem.gateway.sce +++ b/2.3-1/demos/scilab2c.dem.gateway.sce @@ -16,6 +16,11 @@ subdemolist = ["Trigonometric Identity" , "TrigonometricIdentity.dem.sce"; "Linear Regression" , "LinearRegression.dem.sce"; "Symbols", "Symbols.dem.sce"; "High Pass Filter", "Filter.dem.sce"; +<<<<<<< HEAD + ]; + +subdemolist(:,2) = demopath + subdemolist(:,2); +======= "Arduino blink", "blink.dem.sce"; "Arduino digital input", "digital_in.dem.sce"; "Arduino analog voltage i/o", "analog_in_out_volt.dem.sce"; @@ -25,3 +30,4 @@ subdemolist = ["Trigonometric Identity" , "TrigonometricIdentity.dem.sce"; ]; subdemolist(:,2) = demopath + subdemolist(:,2); +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 |