Revert commit 994e07db0 (PR #1715), because it's irrelevant for master.
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 6 Nov 2013 08:32:03 +0000 (12:32 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 6 Nov 2013 08:32:03 +0000 (12:32 +0400)
commit65389e41db2d16f09101f7469f4404935754b0d9
tree65dcf2099bed8ed5607c76899fd95bf649818fe1
parent8f5eaca354f39096be604ee1e3c96e70191f0671
Revert commit 994e07db0 (PR #1715), because it's irrelevant for 

Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
modules/java/CMakeLists.txt
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp [deleted file]
modules/java/generator/src/java/highgui+VideoCapture.java [deleted file]