Merge pull request #5487 from Wangyida:python
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Nov 2015 12:26:53 +0000 (12:26 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Nov 2015 12:26:53 +0000 (12:26 +0000)
1  2 
modules/python/src2/cv2.cpp

Simple merge