Vincent COUVERT [Thu, 30 Jul 2015 15:37:03 +0000]
Fix test after https://codereview.scilab.org/#/c/16911/
Change-Id: I3b1454a195822d1354aadd8a697ac1175232a1c9
Adeline CARNIS [Wed, 29 Jul 2015 15:06:41 +0000]
Levitron demo updated. Stop and Reinit callback must be priority. Set callback_type property to 12.
Change-Id: I99c8f5ee6b45747089ec72b673ea08efae5d346c
Calixte DENIZET [Thu, 30 Jul 2015 10:45:04 +0000]
History: restore it
Change-Id: I3c1412ff51a23e1f14f2110a99d02cf993695b37
Cedric Delamarre [Thu, 30 Jul 2015 15:15:04 +0000]
display of exec fixed.
function testExec()
c = 1
b = 2
endfunction
exec(testExec, "errcatch", -1);
Change-Id: I9b67f425668ea6acc201d8f65fac08a605d2f915
Cedric Delamarre [Thu, 30 Jul 2015 14:43:33 +0000]
missplaced Lock fixed
get the test case of bug 12722, then click in the window and press some keys.
Change-Id: I0833d68f1effe1cb2bb0a461f7113b953d54e3d4
Cedric Delamarre [Thu, 30 Jul 2015 09:51:09 +0000]
double free in select case fixed
a=12;
select a
case 12
a=14
end
Change-Id: I8af5b4c4151ca1af30dba7c4eb2046e014d83286
Cedric Delamarre [Thu, 30 Jul 2015 11:47:05 +0000]
StoreCommand fixed and avoid Spurious Wakeups.
start Scilab with gui and click on cross to close it.
process never exit.
Change-Id: I960414ba2203c21dadee7d3452fb7f8c1f73f03d
Vincent COUVERT [Thu, 30 Jul 2015 15:19:08 +0000]
No more force English at startup.
Partial revert of https://codereview.scilab.org/#/c/16915/ & https://codereview.scilab.org/#/c/16912/
Change-Id: I02eba0f57bbae18d66b903635e09da1f02bba392
Francois Granade [Thu, 30 Jul 2015 09:14:32 +0000]
set up changelog for 6.0.0 alpha-2
Change-Id: I56fb5a85648b67f40b1cf4482685593a1e8bd6f6
Cedric Delamarre [Wed, 29 Jul 2015 16:00:02 +0000]
[demo] image.dat updated with new save
Change-Id: Ib0e3fca37f697af318c980d3f04de9112bd607c4
Antoine ELIAS [Wed, 29 Jul 2015 18:13:13 +0000]
fix storing of userdata address on 64 bits version
Change-Id: I43b6db0d431818945276f41173c1a12feaa04947
Antoine ELIAS [Wed, 29 Jul 2015 12:59:42 +0000]
add a ';' between end dans next command to help parser
bug reported : http://bugzilla.scilab.org/show_bug.cgi?id=14014
Change-Id: I598708c0d79380f0b0a81beea7bc36ed78dc8940
Antoine ELIAS [Wed, 29 Jul 2015 12:38:31 +0000]
Revert "insertion of [] in struct may used to delete entire row or col. fix some overloading tests"
This reverts commit
6bede4a5476297c4028368d269e35155bc4903e9.
Change-Id: Ifc2b5170d32ff947572e8049bb5d0b9ee6ef55f9
Cedric Delamarre [Wed, 29 Jul 2015 09:58:05 +0000]
close scilab with cross must close the process.
Change-Id: If88493977f0d289e7e30e9e50ca16aec60f0551f
Cedric Delamarre [Wed, 29 Jul 2015 09:38:47 +0000]
linux compilation fixed
Change-Id: I0c17ed6461ca3b03c3df307b903e1877a9e02884
Vincent COUVERT [Wed, 29 Jul 2015 09:32:58 +0000]
Fix a typo
Change-Id: Ic2f07b6b57c90e2e5d0911c9e0e6d5bebb42dd43
Cedric Delamarre [Tue, 28 Jul 2015 15:04:37 +0000]
module preferences plugged
Change-Id: Ib591895037b72513d1f7e7448e4c19834653d681
Vincent COUVERT [Wed, 29 Jul 2015 09:26:33 +0000]
Removed references to deprecated/removed functions
Change-Id: I573a1eb429e8ad6f65a6fe83db5a9f915b46537e
Vincent COUVERT [Wed, 29 Jul 2015 08:37:05 +0000]
Review + translation before release
Change-Id: I1885f5d5691c1a0d85891c6a327bf5461026eaba
Vincent COUVERT [Wed, 29 Jul 2015 08:06:06 +0000]
revnumber switched from 5.6.0 to 6.0.0
Change-Id: I4cd7a44f703fcc8d248fb9c2ae6ee115fa1e0e13
Vincent COUVERT [Wed, 29 Jul 2015 07:40:46 +0000]
Fix path to css + remove file from Makefile
Change-Id: I95856ab06590d9a7ba588a816ed517db0ad03f59
Francois Granade [Wed, 29 Jul 2015 00:02:22 +0000]
English help home page and CHANGELOG for alpha release. Missing the help home page in French
Change-Id: I3822bc9233b8ec2558c5321fadf6e97cd7ae3d52
Cedric Delamarre [Tue, 28 Jul 2015 15:25:31 +0000]
localization fixed under linux
Change-Id: I940aa2ed270e957b12a3b0a20a836817d6a79e86
Antoine ELIAS [Tue, 28 Jul 2015 09:08:05 +0000]
change variable declaration to f2c solution
Change-Id: I44bf099b745aaaf77dbef1a605c30ae336f9b23f
Calixte DENIZET [Tue, 28 Jul 2015 09:56:43 +0000]
Console: fix print issue in term after segfault and print the stack in this case
Change-Id: Ia1db001bab6125fdfe2a720b2b8f85edb34d169d
Antoine ELIAS [Tue, 28 Jul 2015 10:41:15 +0000]
add a space to prompt
Change-Id: I267654d6c0ad1aa50dd2a22b55bdbb2ed4a916db
Antoine ELIAS [Tue, 28 Jul 2015 11:53:47 +0000]
add welcome alpha message and force localization in en_US
Change-Id: I633ff7facfdeb5d1103a155b76396d96537b392a
Antoine ELIAS [Mon, 27 Jul 2015 16:17:18 +0000]
insertion of [] in struct may used to delete entire row or col.
fix some overloading tests
test_run overloading bug_7042
test_run overloading bug_2267
Change-Id: I2cbdc9fc6ab8cc1d693c665172436f750e455553
Antoine ELIAS [Mon, 27 Jul 2015 15:46:54 +0000]
update sparse test reference
Change-Id: Icf536624c1b0d4bae412599f4bd642a65097f8d6
Vincent COUVERT [Mon, 27 Jul 2015 14:26:08 +0000]
Fix DYLD_LIBRARY_PATH for Mac OS X binaries
Change-Id: Iee5529242a4ce9cd0d5e86a4e199aefc5e10939d
Antoine ELIAS [Mon, 27 Jul 2015 14:00:04 +0000]
mgetl does not try to read file as UTF-16 in binary mode
Change-Id: I06fe5f9ba811ab1355df03722b463d008c098e13
Antoine ELIAS [Mon, 27 Jul 2015 13:03:46 +0000]
sparse comparison
Change-Id: Ia73734697baa94232d8bc08e93c2cebe2dc22b27
Vincent COUVERT [Mon, 27 Jul 2015 14:01:18 +0000]
Remove old Mac OS X ignored error and replace it by new one (usefull when testing Scilab using ssh connection)
Change-Id: I5971fc78c6845801511df8ce06bed118377bb743
Vincent COUVERT [Mon, 27 Jul 2015 11:14:43 +0000]
Fix DYLD_LIBRARY_PATH for Mac OS X binaries
Change-Id: Iaa367a28b1d809ce1d65d577ca57d97d1268ea9b
Cedric Delamarre [Tue, 21 Jul 2015 13:56:00 +0000]
[cleanup] symbolic functions references removed.
Change-Id: I549320ffe2c48ca943184771057977fff7eaa203
Cedric Delamarre [Tue, 21 Jul 2015 11:58:49 +0000]
[cleanup] references of old functions removed.
Change-Id: I09501900453c3169eab6636b56ea6e830617e6d1
Antoine ELIAS [Mon, 27 Jul 2015 09:09:52 +0000]
extract : a(-1) must return a error
Change-Id: I89d5491f7b0d1ab51173b2ea2e62e4e5c6fc4c9e
Antoine ELIAS [Mon, 27 Jul 2015 09:03:19 +0000]
update CHANGES_6.0.X
Change-Id: I7470944c84ecc4cefff0d52207ee04d2efda0bc7
Vincent COUVERT [Mon, 27 Jul 2015 09:07:30 +0000]
JRE 8 embedded in Mac OS X binary versions
Change-Id: Icafcbfa027e45f92e474bc74d7192bfa5bf1b836
Antoine ELIAS [Fri, 24 Jul 2015 07:53:55 +0000]
exec("file"); must be eq at exec("file", 0)
Change-Id: Ie00446b21246fc5f49488c893ba48566196c6c71
Vincent COUVERT [Mon, 27 Jul 2015 07:35:43 +0000]
* Merge CHANGES_5.5.X (5.5.2->5.5.3) into CHANGES_6.0.X
* Merge CHANGES_5.6.X into CHANGES_6.0.X
Change-Id: I28c174b7fd3bdc684fac44796be45b12eeeccd97
Antoine ELIAS [Mon, 27 Jul 2015 08:18:37 +0000]
fix test_run after https://codereview.scilab.org/#/c/16893/
The check of extraction from empty variable ( [], {} or struct() )
must be done in extract function and not in checkIndexesArguments
to avoid disturbing insertion behaviour on empty variable.
Change-Id: I237a2f98f11fb27146b0773165c70ac5549cb558
Antoine ELIAS [Fri, 24 Jul 2015 14:12:18 +0000]
fix trouble after extract improvements
test_run ast extractEmpty
Change-Id: I01c5c0e3754f6b8277c083cecfb2719d716cd46f
Antoine ELIAS [Tue, 21 Jul 2015 15:46:32 +0000]
do not dereference iterator returned by end().
Change-Id: I430eaf7f6a797b78dbb6f4c8cac9f8376e4857d1
Vincent COUVERT [Fri, 24 Jul 2015 14:40:47 +0000]
Adapt Mac OS X JVM startup now we have switched to JDK 8
Change-Id: I288c806118340ad65886d18acbcb5abced84d4fe
Adeline CARNIS [Wed, 22 Jul 2015 13:09:44 +0000]
poly returned a complex polynom instead to real polynom.
Change-Id: I90b8b775266d033c7718bc453b1c05284a13817c
Antoine ELIAS [Tue, 19 May 2015 16:14:04 +0000]
improve extract
Change-Id: Ia98df043135bc5246da4214a2c55e905a90b9b17
Calixte DENIZET [Thu, 23 Jul 2015 13:43:47 +0000]
Parser: fix problem with ~ when used as a path element
cd ~
cd ~/
Change-Id: Iece34817d639ba0331d50a281f15b9c426b212a7
Clément DAVID [Thu, 23 Jul 2015 13:47:13 +0000]
JDK8 : update the detected JAVA_HOME
* prefer jdk8 then fallback to the defaults
* handle Oracle JDK8 then cross-distro paths
Change-Id: I4004ea46c1c37a3ea297c36eff91877d528a490b
Cedric Delamarre [Wed, 22 Jul 2015 11:59:59 +0000]
call stack error and try catch fixed
function toto()
test()
endfunction
function test()
a=1;
a(3)
end
try
toto()
catch
disp("error catched")
end
// call stack must not be displayed
cos()
Change-Id: I330481494c605b9102b370e9851156742f5daa28
Cedric Delamarre [Wed, 22 Jul 2015 10:27:48 +0000]
non displayed error messages fixed
a = h5open(TMPDIR + "/test.h5", "a");
a.toto
Change-Id: I517a510e0f7d4401c75696ba2c8872d8296d8077
Vincent COUVERT [Thu, 23 Jul 2015 13:11:29 +0000]
Force JRE 8 at startup for Mac OS X version
Change-Id: I19015ddd50ab89a0d53df4c5d495d42405bbfaaf
Cedric Delamarre [Wed, 8 Apr 2015 09:50:03 +0000]
call_scilab plugged.
Change-Id: I308dfa334ca52f90ea4901147559523805bb0917
Clément DAVID [Thu, 23 Jul 2015 09:47:26 +0000]
Use /lib64 by default to avoid a warning on Fedora with both /lib and /lib64
Change-Id: I02ae6780ee18473285b16c76b27860e1f7688d1d
Clément DAVID [Thu, 23 Jul 2015 08:41:50 +0000]
Compilation : rename splitpath to allow the use of Link-Time Optimization
Change-Id: Ic5843b3eda49f4cac0e8e091cb23bec8561f1054
Clément DAVID [Thu, 23 Jul 2015 08:40:47 +0000]
Xcos: remove the previously used stubs
Change-Id: I91cac8551abd8314011ed11f591bf3dec9794f6c
Vincent COUVERT [Thu, 23 Jul 2015 11:44:40 +0000]
Switch to ecj 4.4.2 (for compatibility with Java 8)
Change-Id: I331ba74432bf229e11ca8660f345337cf23c5645
Antoine ELIAS [Thu, 23 Jul 2015 07:43:44 +0000]
fix isRelease and isDebug, do not take of position of 'release' in [a,b] = getversion() returns
Change-Id: I7d8dd49c2ed60133acc473beaf9bcd0379a945ad
Antoine ELIAS [Thu, 23 Jul 2015 09:34:41 +0000]
fix ltitr buffer overflow
exec SCI/modules/signal_processing/tests/unit_tests/filter.tst
Change-Id: I2e61fdaa40a433967189211511269d38b0486a20
Vincent COUVERT [Tue, 21 Jul 2015 08:43:31 +0000]
Migrate to JDK 1.8
* JDK no more embedded in prerequirements (must be installed on compiling machine)
* Move scirenderer to the shared build system
Change-Id: I6e2f54bba6c05faee9afa224799afe70a7be34e3
Antoine ELIAS [Wed, 22 Jul 2015 16:22:04 +0000]
fix comparison between sparse and sparse or sparsebool and sparsebool ( intel compiler trouble, again ... )
sparse(1) == sparse(1)
sparse(1) == sparse(ones(5,5))
sparse(ones(5,5)) == sparse(1)
sparse(ones(5,5)) == sparse(ones(5,5))
test_run ast comparisonequal
test_run ast comparisonnonequal
Change-Id: I4d0d0c4ce182d8bf94f3ccddca5d2137fce10e76
Cedric Delamarre [Wed, 22 Jul 2015 16:47:12 +0000]
flex fixed about bool token
%t & %t
Change-Id: I97ed978175d87821bda1d4a16e6918f469c0a36a
Vincent COUVERT [Wed, 22 Jul 2015 10:13:47 +0000]
Update toolbox after https://codereview.scilab.org/16858
Change-Id: Id32efade1999c94f8b3e272e46a58879ef0ee2b4
Antoine ELIAS [Tue, 21 Jul 2015 16:41:47 +0000]
clear result before throw exception if overload of fieldExp failed
Change-Id: I61448cb68d631491478b57e0dad8351bb2605678
Clément DAVID [Tue, 21 Jul 2015 10:22:57 +0000]
Fix a compilation issue
Change-Id: I119a6c0c57b7159d8f56f3766a669298228e1e02
Paul Bignier [Fri, 3 Jul 2015 10:14:00 +0000]
Scicos palettes: fix Linear.cosf
* 'dep_ut' can only have 2 elements, so squared with the VARIABLE_DELAY("define") values
Change-Id: I64dddc39a2c3a1cd2d8cf1737fea3af61508d51c
Antoine ELIAS [Fri, 17 Jul 2015 13:47:17 +0000]
add save(filename) to save all variables in context.
this function save variables in SCOPE_CONSOLE only ( level == 2 )
I change scope opening @ scilab start to ensure .start of modules and/or toolbox does not clear Scilab stuff.
Now we open 3 scopes @ startup,
SCOPE_GATEWAY(0) : with gateways and main variables ( SCI, TMPDIR, SCIHOME, ...)
SCOPE_MACROS(1) : with execution of scilab.start ( including {modules}.start and {atoms_toolboxes}.start)
SCOPE_CONSOLE(2) : empty scope at the end of Scilab init phase.
Change-Id: I9c2a339bc87729add539a00a1df6e9f56e3c1481
Cedric Delamarre [Tue, 21 Jul 2015 08:09:26 +0000]
tests comparisonequal and comparisonnonequal fixed.
tlist comparison must call overload before internal comparison.
Change-Id: I12704d58dce5cd15b9e22ffe2b4c5a4bdd5d6ce3
Antoine ELIAS [Fri, 17 Jul 2015 17:27:48 +0000]
add md5 of sci file in lib file to check modification in genlib process
Change-Id: I2409d85e2419205b859a93c4e5eaf232ff055c59
Antoine ELIAS [Mon, 20 Jul 2015 15:33:00 +0000]
update hdf5 tests with new hdf5 sod format
Change-Id: I5c574ccabdb999717930d227f2225d26d431e639
Vincent COUVERT [Mon, 20 Jul 2015 12:41:06 +0000]
Revert "Data structures"
This reverts commit
35fc2cad955ce52546dcffb2401b29f003d8b766.
Conflicts:
scilab/CHANGES_6.0.X
Change-Id: I0102ff6c733f07175793350fa62e86f03acb751e
Cedric Delamarre [Fri, 17 Jul 2015 13:31:16 +0000]
List comparison fixed
test_run core eq_neq_priority
Change-Id: I3ebaff83167eefa2c4575471b0e53a704f2d04ec
Antoine ELIAS [Thu, 16 Jul 2015 15:54:21 +0000]
save and load keep fields order of struct
Change-Id: If628adcb2679a3deeea16788b0f5e4bde7536424
Cedric Delamarre [Fri, 17 Jul 2015 11:54:04 +0000]
bug_9339 updated
Change-Id: I3d9ea8a9ddc39e235173e421915c71f690796592
Cedric Delamarre [Fri, 17 Jul 2015 12:38:00 +0000]
toolbox skeleton compilation fixed
Change-Id: I3ec2efb52c6d493d94b095014d664727ebb83eb8
Cedric Delamarre [Thu, 16 Jul 2015 16:14:34 +0000]
windows compilation fixed
Change-Id: I7f1c525382c7def90570b61a3dbe0bbb1f270286
Cedric Delamarre [Thu, 16 Jul 2015 15:20:25 +0000]
symbolic removed from iss
Change-Id: I20273b46339cbca6302ddffc9fc96a972f05c04b
Antoine ELIAS [Thu, 16 Jul 2015 09:40:57 +0000]
rewrite hypermat api for scilab 6
Change-Id: Id0e28ea774f51a019266f58bddcfacd84d15b03b
Vincent COUVERT [Thu, 16 Jul 2015 14:21:15 +0000]
Put this part back since bsiz no more declared (stack.h removed)
Change-Id: I04e05512600cbe8668f9a03c08ecd5b925b0d970
Cedric Delamarre [Tue, 7 Jul 2015 07:46:24 +0000]
[cleanup] symbolic module removed
Change-Id: I0b4db61dc29c1ffb9fa78109cff47c78c95bfc8f
Cedric Delamarre [Thu, 9 Jul 2015 13:12:53 +0000]
[cleanup] test directory removed
Change-Id: I8bd7c7d1136894cd4f3d4ef13e77b4636777bddf
Charlotte HECQUET [Wed, 15 Jul 2015 15:07:11 +0000]
bug #13980: When the working directory was changed in the file browser, a "T" was displayed in the console.
Change-Id: I661cb30bfe92befca76f571e4b6db8fff289e3cc
Antoine ELIAS [Wed, 15 Jul 2015 14:00:58 +0000]
bug 13981: fix string corruption in error cases
Change-Id: I8a84503ea3849e63e331ca3b317cba22a3c27bb7
Adeline CARNIS [Thu, 9 Jul 2015 15:01:31 +0000]
cacsd module: [xf, x] = ltitr(...), xf was not the value of final state. test_run('cacsd', 'flts')
Change-Id: I905c0194cf11869a919c99233c5a1d4e3a7f43fd
Marcos CARDINOT [Thu, 16 Jul 2015 07:28:34 +0000]
Remove printf calls
Change-Id: I27f66551232693216acfe911c17ce693f10725db
Paul Bignier [Mon, 6 Jul 2015 15:24:54 +0000]
Core help & gateways: unreference macr2lst after its removal
* https://codereview.scilab.org/#/c/16794 forgot to unref macr2lst from the doc and the gateways list
Change-Id: Ifc18e55b05516fecb78d4a53cc6452343bb7b7f1
Cedric Delamarre [Mon, 13 Jul 2015 15:42:39 +0000]
macr2tree fixed about line function number.
Change-Id: Id22e85ef1f981eadde174f9b8ea4a4791444a14d
Cedric Delamarre [Mon, 13 Jul 2015 15:38:11 +0000]
last column/line of body expressions fixed
start scilab with --AST-trace flag then with a function like :
function test()
a=1;
endfunction
the last column and line of the SeqExp (the body)
must be point to le last line/column of the AssignExp (a=1;)
instead of the first column of the next line ("e" of endfucntion)
Change-Id: I5a7767a1fa604204b4120600d9b65933eb526f9b
Vincent COUVERT [Thu, 16 Jul 2015 06:51:12 +0000]
Set these tests as NOT FIXED after https://codereview.scilab.org/#/c/16838/
Change-Id: Ie1f5afe73e3e7c3be18cc122782c8e333e1905c2
Antoine ELIAS [Fri, 10 Jul 2015 11:48:18 +0000]
Remove analysis from compilation
Intel Compiler on Windows 32 failed to compile.
Not wrong code but it seems lot for template and hxx inclusion.
Analysis will be replugged after investigation.
Change-Id: I2625dc22444c1287983d512924ac7d6812dad6a2
Cedric Delamarre [Fri, 10 Jul 2015 16:05:04 +0000]
insertion of GraphicHandle fixed
a = tlist(["toto", "ui"], []);
a.ui
a.ui = uicontrol();
a.ui
Change-Id: I144cd31c271626599ecc38667026260fa1646dee
Vincent COUVERT [Wed, 15 Jul 2015 11:08:12 +0000]
Fix ref now genlib display messages
Change-Id: I5ad193c58579bda3caba694961d0dc01459024a8
Cedric Delamarre [Mon, 13 Jul 2015 14:35:40 +0000]
t/mlist print fixed
M=mlist(['foo','A','B','C'],[],[],[])
test_run data_structures fieldnames
Change-Id: If0b6da1d4d2b833e64011ce3e61c463b7bd8f37c
Antoine ELIAS [Fri, 10 Jul 2015 14:54:56 +0000]
fix exception management in call overload failed
Change-Id: Ic99c40ddde65abd7e8cf797b99b2a8b7982e9e15
Cedric Delamarre [Fri, 10 Jul 2015 12:35:15 +0000]
mac compilation fixed about multiple definition.
Change-Id: If577b65e5fb35b0f39b076160984c229a51b1533
Cedric Delamarre [Fri, 10 Jul 2015 12:34:04 +0000]
* Compilation of module hdf5 fixed
* fix wrong merge of test bug_7242.tst
* Fix string.tst test (path to library)
Change-Id: Idfc1301cf9d79187834fdf20bdd5175c7eb6b6a2
Antoine ELIAS [Thu, 9 Jul 2015 15:08:59 +0000]
Rename HDF5 functions:
export_to_hdf5 -> hdf5_save
import_from_hdf5 -> hdf5_load
is_hdf5_file -> hdf5_is_file
listvar_in_hdf5 -> hdf5_listvar
Mapping:
load -> hdf5_load
save -> hdf5_save
listvarinfile -> hdf5_listvar
Change-Id: I353625922471ac29583dea9cd3bc1737792e11b8
Antoine ELIAS [Wed, 8 Jul 2015 12:07:27 +0000]
hdf5 load process
change in loading process
before was:
-> load
-> %_sodload
-> import_hdf5_file
-> post process in %_sodload
now is, for version < 3 :
-> load ( mapped on import_from_hdf5_v1/v2 )
-> %_sodload for post processing
and for version == 3:
-> load ( mapped on import_from_hdf5_v3 )
%_sodload will be called only for hdf5 file version < 3 (before scilab 6)
Change-Id: Ie3efc4bcf499d7372111008bed55ddef09cbf036
Vincent COUVERT [Thu, 9 Jul 2015 13:06:17 +0000]
Fix Mac OS X compilation using clang
Change-Id: I8978f578dbe962d6b1fe5476235c389b7c1f1f7e
Vincent COUVERT [Thu, 9 Jul 2015 09:31:04 +0000]
Fix test after https://codereview.scilab.org/#/c/16820/ (export_to_hdf5 no more returns a boolean value)
Change-Id: Ie9f4cf671c5fd25aaa404fb6788346ed11ac8e94