Merge pull request #6078 from PolarNick239:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Oct 2016 17:27:23 +0000 (17:27 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Oct 2016 17:27:23 +0000 (17:27 +0000)
commita799cc13d93949f3a510a2b1d963d6dc9d29fc81
treed90772eb4eda08b64f27363d145b6807975795f6
parentfad05986342ba2128a1f24a0e9586c889bbdc8f0
parent46e08d34ddbc5586b85f73dd9b1440c4708d0f80
Merge pull request #6078 from PolarNick239:master
modules/java/generator/gen_java.py
modules/python/src2/cv2.cpp
modules/python/src2/gen2.py
modules/python/test/test.py