Skip to content
  • Guillaume Lazzara's avatar
    Merge branch 'next' into unstable/scribo · 4d0f7e21
    Guillaume Lazzara authored
    Conflicts:
    	ChangeLog
    	configure.ac
    	milena/ChangeLog
    	milena/apps/papers/levillain.09.ismm/graph.cc
    	milena/doc/examples/tuto4_genericity_and_algorithms.cc
    	milena/mln/canvas/browsing/diagonal2d.hh
    	milena/mln/io/plot/save.hh
    	milena/mln/labeling/value_and_compute.hh
    	milena/mln/morpho/watershed/topological.hh
    	milena/mln/registration/icp.hh
    	milena/mln/subsampling/antialiased.hh
    	milena/mln/util/object_id.hh
    	milena/tests/core/alias/point1d.cc
    	milena/tests/data/Makefile.am
    	milena/tests/literal/Makefile.am
    	milena/tests/unit_test/unit-tests.mk
    	scribo/ChangeLog
    	scribo/scribo/text/recognition.hh
    	scribo/scribo/toolchain/text_in_doc_preprocess.hh
    	scribo/src/Makefile.am
    	scribo/src/binarization/Makefile.am
    	scribo/tests/binarization/Makefile.am
    	scribo/tests/unit_test/unit-tests.mk
    4d0f7e21
To find the state of this project's repository at the time of any of these versions, check out the tags.