Merge branch 'noslicemgr' into nocomponent
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 May 2018 09:47:02 +0000 (11:47 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 May 2018 09:47:02 +0000 (11:47 +0200)
commitfe078a6fed085fdc81c1b29c619188866ca0c12b
treea729f8ff2092d70ada89135ece72d4dc1ac23b39
parent052e281f8c79237b6759cbb259407f071adda1cc
parente4aafa7da681902d0c937b769830c302d38f8815
Merge branch 'noslicemgr' into nocomponent