Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:39:02 +0000 (20:39 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:39:02 +0000 (20:39 +0400)
commit91f47d27794bbcf7e4e4582875923643230d57d7
tree16e708804c184a9effff75fa4725c048ad65011f
parent8dbde3297eead00a07f76498346816b56605609d
parent9b149edde6dec7b040fceab74e004d35f08adea4
Merge branch '2.4'

Conflicts:
modules/core/include/opencv2/core/version.hpp