From: Andrey Kamaev <andrey.kamaev@itseez.com>
Date: Fri, 21 Dec 2012 13:58:48 +0000 (+0400)
Subject: Merge branch 2.4
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1223
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=962884cdec1767e832b3364227fcb9479c36c354;p=profile%2Fivi%2Fopencv.git

Merge branch 2.4
---

962884cdec1767e832b3364227fcb9479c36c354
diff --cc doc/user_guide/ug_mat.rst
index ad930ba,f6474fa..e475c28
--- a/doc/user_guide/ug_mat.rst
+++ b/doc/user_guide/ug_mat.rst
@@@ -71,7 -71,9 +71,9 @@@ There are functions in OpenCV, especial
      //... fill the array
      Mat pointsMat = Mat(points);
  
- One can access a point in this matrix using the same method \texttt{Mat::at}: ::
 -One can access a point in this matrix using the same method ``Mat::at`` : 
++One can access a point in this matrix using the same method ``Mat::at`` :
+ 
+ ::
  
      Point2f point = pointsMat.at<Point2f>(i, 0);