Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix
authormlyashko <maria.lyashko@itseez.com>
Tue, 25 Mar 2014 10:52:39 +0000 (14:52 +0400)
committermlyashko <maria.lyashko@itseez.com>
Tue, 25 Mar 2014 10:52:39 +0000 (14:52 +0400)
commit953aafbd3d855d671e7c6c2eb3ac603fb892baca
tree7de97532e98198f94ccbddf8eeb1ae8b9d89ea39
parentf38fe76025d96bf8512e5dc366dc232d1365ccd9
parentda7a605224df80ae01549375948eee9726370c24
Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix