This is a merge commit message of the following branches:
Merge: 7307887 e2e8ec0
Conflicts: milena/mln/canvas/browsing/snake_vert.hh
milena/ChangeLog | 26 ++++++++++++++++++++++++++ milena/mln/canvas/browsing/snake_vert.hh | 2 +- milena/mln/fun/v2v/hsi_to_rgb.hh | 2 +- milena/mln/literal/grays.hh | 3 --- 4 files changed, 28 insertions(+), 5 deletions(-)
hooks/post-receive