olena-2.0-504-g7f27ebc Merge branch 'exp/all-blobs' into exp/TL
This is a merge commit message of the following branches: Merge: afa987b f8e6233 milena/ChangeLog | 22 +++++ milena/mln/canvas/labeling/blobs.hh | 136 ++++++++++++++++++++++++++-- milena/mln/core/internal/pixel_impl.hh | 6 ++ milena/mln/labeling/all_blobs.hh | 127 -------------------------- milena/mln/labeling/blobs.hh | 65 ++++++++++---- milena/mln/labeling/blobs_and_compute.hh | 83 +++++++++++++++-- milena/tests/labeling/Makefile.am | 1 - milena/tests/labeling/all_blobs.cc | 63 ------------- milena/tests/labeling/blobs.cc | 26 +++++- milena/tests/labeling/blobs_and_compute.cc | 55 ++++++++--- 10 files changed, 339 insertions(+), 245 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform
On 18/04/2013 16:09, Guillaume Lazzara wrote:
This is a merge commit message of the following branches:
Merge: afa987b f8e6233
Of course, these are work branches and you are free to use them as you wish, but you should try to preserve a linear history. Right now, the history under exp/TL doesn't look good enough to me to be pushed as-is into `next'. Especially, the ``Fix something'' patches should be squashed into the relevant commit using `git rebase --interactive'.
participants (2)
-
Guillaume Lazzara -
Roland Levillain