[opencv] 84/98: Merge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit 96d747f03090a75f1e5879a1df740dd65e7dc7bc
Merge: ff3bb9f 5164c4b
Author: Maksim Shabunin <maksim.shabunin at itseez.com>
Date:   Wed Apr 13 10:02:56 2016 +0000

    Merge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4

 apps/annotation/opencv_annotation.cpp | 163 ++++++++++++++++++++--------------
 1 file changed, 98 insertions(+), 65 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git