Joseph Mirabel authored 9 years ago and Joseph Mirabel committed 9 years ago

Conflicts:
	include/hpp/manipulation/graph/edge.hh
	include/hpp/manipulation/graph/statistics.hh
	src/graph/edge.cc
	src/graph/statistics.cc