Roman Donchenko 65389e41db Revert commit 994e07db0 (PR #1715), because it's irrelevant for master.
Conflicts:
	modules/java/generator/src/cpp/VideoCapture.cpp
2013-11-06 12:32:03 +04:00
..
2013-09-02 14:00:44 +04:00
2013-10-11 23:31:31 -04:00
2013-10-08 12:46:43 +04:00
2013-10-24 17:37:33 +04:00
2013-08-21 18:59:24 +04:00