Vadim Pisarevsky 97dc5be841 Merge pull request #5821 from alalek:build_framework		2015-12-18 10:12:55 +00:00
..
include/opencv2	merge Win10/VS2015 changes	2015-12-17 21:15:59 +01:00
misc/java/test
perf
src	merge Win10/VS2015 changes	2015-12-17 21:15:59 +01:00
test	Merge 2.4 into master	2015-12-08 10:24:54 +03:00
CMakeLists.txt	update osx and ios build_framework.py	2015-12-17 16:17:31 +03:00