From: Roman Donchenko Date: Tue, 1 Oct 2013 13:37:05 +0000 (+0400) Subject: Merge branch 'master' into merge-2.4 X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3735^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6133aeede82a7eaeff06cba62b7146c9d8225182;p=platform%2Fupstream%2Fopencv.git Merge branch 'master' into merge-2.4 Conflicts: doc/tutorials/definitions/tocDefinitions.rst --- 6133aeede82a7eaeff06cba62b7146c9d8225182 diff --cc doc/tutorials/definitions/tocDefinitions.rst index d1fb039,c918aa2..c036b0b --- a/doc/tutorials/definitions/tocDefinitions.rst +++ b/doc/tutorials/definitions/tocDefinitions.rst @@@ -11,4 -11,4 +11,5 @@@ .. |Author_EricCh| unicode:: Eric U+0020 Christiansen .. |Author_AndreyP| unicode:: Andrey U+0020 Pavlenko .. |Author_AlexS| unicode:: Alexander U+0020 Smorkalov - .. |Author_BarisD| unicode:: Bar U+0131 U+015F U+0020 Evrim U+0020 Demir U+00F6 z ++.. |Author_BarisD| unicode:: Bar U+0131 U+015F U+0020 Evrim U+0020 Demir U+00F6 z + .. |Author_DomenicoB| unicode:: Domenico U+0020 Daniele U+0020 Bloisi