Roman Donchenko 9b7e77ccda Merge commit '83cdd43a' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/version.hpp		2013-12-30 16:36:35 +04:00
..
cpp	Revert commit 994e07db0 (PR #1715), because it's irrelevant for master.	2013-11-06 12:32:03 +04:00
java	Merge commit '83cdd43a' into merge-2.4	2013-12-30 16:36:35 +04:00