Merge branch 'norm_Matx' of git://github.com/vrabaud/opencv
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 23 Aug 2012 20:38:10 +0000 (00:38 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 23 Aug 2012 20:38:10 +0000 (00:38 +0400)
commit9be63c50dd07a58db1447b64206e5c51b0af0cf2
tree2db8948e281b36c7b36cd6d14ee04dfc95146d06
parent56b7ddad0909b7dd78ba132c5b07c283bfdd6a2a
parent1baf5209c4df292922f78e2757321c359f8b28e8
Merge branch 'norm_Matx' of git://github.com/vrabaud/opencv