• Guillaume Lazzara's avatar
    Merge branches 'next' and 'exp/milena-z' into next · 98eedea5
    Guillaume Lazzara authored
    Conflicts:
    	ChangeLog
    	milena/ChangeLog
    	milena/doc/tutorial/tutorial.tex
    	milena/tests/geom/Makefile.am
    	milena/tests/io/pbms/load.cc
    	milena/tests/io/pgms/load.cc
    	milena/tests/io/ppms/load.cc
    	scribo/ChangeLog
    	scribo/core/object_image.hh
    	scribo/demo/Makefile.am
    	scribo/primitive/link/internal/anchors_3.hh
    	scribo/scribo.mk
    	scribo/src/binarization/Makefile.am
    	scribo/src/binarization/sauvola_ms.cc
    	scribo/src/debug/Makefile.am
    98eedea5
To find the state of this project's repository at the time of any of these versions, check out the tags.