Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:17:13 +0000 (14:17 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:17:13 +0000 (14:17 +0400)
commit78a338159d595d1264dfdf6608b85b5a695ce2a4
tree9e04782267e5a221cac963f37d02c6db6112cd40
parent013e9294f6ecc280bea293e2a2251f3f25df6d73
parent63873a839355a5d3e77cb8177576cbd401e4a997
Merge branch '2.4'
modules/core/src/persistence.cpp
modules/python/src2/cv2.cpp