GitLab

	* mln/debug/trace.hh: Here.
	Aesthetic changes.

	* GScribo/BUGS,
	* GScribo/GScribo.pro,
	* GScribo/GScribo.pro.user,
	* GScribo/GScribo.pro.user.1.3,
	* GScribo/PagesWidget/pagesdelegate.cpp,
	* GScribo/PagesWidget/pagesdelegate.h,
	* GScribo/PagesWidget/pagesmodel.cpp,
	* GScribo/PagesWidget/pagesmodel.h,
	* GScribo/PagesWidget/pageswidget.cpp,
	* GScribo/PagesWidget/pageswidget.h,
	* GScribo/Preferences/generaloptions.cpp,
	* GScribo/Preferences/generaloptions.h,
	* GScribo/Preferences/generaloptions.ui,
	* GScribo/Preferences/ocroptions.cpp,
	* GScribo/Preferences/ocroptions.h,
	* GScribo/Preferences/ocroptions.ui,
	* GScribo/Preferences/optionwidget.h,
	* GScribo/Preferences/preferencesdialog.cpp,
	* GScribo/Preferences/preferencesdialog.h,
	* GScribo/Preferences/preferencesdialog.ui,
	* GScribo/Preferences/preprocessingoptions.cpp,
	* GScribo/Preferences/preprocessingoptions.h,
	* GScribo/Preferences/preprocessingoptions.ui,
	* GScribo/Preferences/segmentationoptions.cpp,
	* GScribo/Preferences/segmentationoptions.h,
	* GScribo/Preferences/segmentationoptions.ui,
	* GScribo/Processing/preprocess.cpp,
	* GScribo/Processing/preprocess.h,
	* GScribo/Processing/process.cpp,
	* GScribo/Processing/process.h,
	* GScribo/Processing/progressdialog.cpp,
	* GScribo/Processing/progressdialog.h,
	* GScribo/Processing/runner.cpp,
	* GScribo/Processing/runner.h,
	* GScribo/Rendering/abstractregionitem.h,
	* GScribo/Rendering/backgroundtexture.h,
	* GScribo/Rendering/graphicsview.cpp,
	* GScribo/Rendering/graphicsview.h,
	* GScribo/Rendering/regionitem.cpp,
	* GScribo/Rendering/regionitem.h,
	* GScribo/Rendering/rootgraphicsitem.h,
	* GScribo/Rendering/scene.cpp,
	* GScribo/Rendering/scene.h,
	* GScribo/Rendering/selection.cpp,
	* GScribo/Rendering/selection.h,
	* GScribo/TODO,
	* GScribo/XmlWidget/attributesmodel.cpp,
	* GScribo/XmlWidget/attributesmodel.h,
	* GScribo/XmlWidget/selectionproxy.h,
	* GScribo/XmlWidget/xmlattributes.cpp,
	* GScribo/XmlWidget/xmlattributes.h,
	* GScribo/XmlWidget/xmldelegate.h,
	* GScribo/XmlWidget/xmlitem.cpp,
	* GScribo/XmlWidget/xmlitem.h,
	* GScribo/XmlWidget/xmlmodel.cpp,
	* GScribo/XmlWidget/xmlmodel.h,
	* GScribo/XmlWidget/xmlview.cpp,
	* GScribo/XmlWidget/xmlview.h,
	* GScribo/XmlWidget/xmlwidget.cpp,
	* GScribo/XmlWidget/xmlwidget.h,
	* GScribo/aboutdialog.h,
	* GScribo/aboutdialog.ui,
	* GScribo/configs.h,
	* GScribo/dir.h,
	* GScribo/dockwidget.h,
	* GScribo/main.cpp,
	* GScribo/mainwindow.cpp,
	* GScribo/mainwindow.h,
	* GScribo/mainwindow.ui,
	* GScribo/region.h,
	* GScribo/regionwidget.cpp,
	* GScribo/regionwidget.h,
	* GScribo/variantpointer.h,
	* GScribo/xml.cpp,
	* GScribo/xml.h: Remove.

Anthony Seure authored Feb 27, 2013 and Roland Levillain committed Apr 17, 2013

	* scribo/core/component_set.hh,
	* scribo/core/line_set.hh:
	Here.

	* scribo/core/component_set.hh,
	* scribo/core/object_links.hh: Add missing member documentation.

	* scribo/debug/logger.hh: Fix an invalid object reference.

	* doc/scribo/core/component_set.dox: Remove and move documentation...

	* scribo/core/component_set.hh: ... here.

	* mln/labeling/n_max.hh: Move internal function to namespace
	internal.

	* tests/labeling/n_max.cc: Update function namespaces.

	* doc/mln/labeling/labeling.dox: New. Introduce labeling module.

	* mln/labeling/background.hh,
	* mln/labeling/colorize.hh,
	* mln/labeling/compute.hh,
	* mln/labeling/compute_image.hh,
	* mln/labeling/flat_zones.hh,
	* mln/labeling/foreground.hh,
	* mln/labeling/mean_values.hh,
	* mln/labeling/pack.hh,
	* mln/labeling/regional_maxima.hh,
	* mln/labeling/regional_minima.hh,
	* mln/labeling/relabel.hh,
	* mln/labeling/superpose.hh,
	* mln/labeling/value.hh,
	* mln/labeling/value_and_compute.hh,
	* mln/labeling/wrap.hh: Set documentation as part of the labeling
	group.

	* mln/trait/ch_value.hh,
	* mln/trait/concrete.hh: Here.

	* doc/examples/multi_files_f1.cc.raw,
	* doc/examples/multi_files_f2.cc.raw,
	* doc/examples/multi_files_main.cc.raw,
	* doc/examples/multiple_def.cc.raw,
	* doc/examples/typenametemplate.cc.raw,
	* doc/examples/undef_global_vars.cc.raw,
	* doc/examples/wrongvaluetype.cc.raw: New.

	* doc/ref-guide.tex: Add a new section.

	* doc/Makefile.am ($(srcdir)/img/small.png): New rule.

	* Makefile.am,
	* doc/Makefile.am,
	* milena/doc/Makefile.am,
	* scribo/doc/Makefile.am:
	Here.

Conflicts:
	ChangeLog
	milena/ChangeLog

	* configure.ac: Here.

	* apps/mesh-segm-skel/Makefile.am (MOSTLYCLEANFILES): Here.

	* python/Makefile.am: s/TESTS_ENVIRONMENT/LOG_COMPILER/.

	* run.in: Here.
	Convert to UTF-8.