Merge pull request #3198 from mshabunin:java_test_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 11 Sep 2014 16:15:25 +0000 (16:15 +0000)
committerAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 11 Sep 2014 16:15:25 +0000 (16:15 +0000)
1  2 
cmake/OpenCVDetectPython.cmake

Simple merge