Roman Donchenko 5ac3b8d5d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Pull requests:
	#904 from ograycode:2.4
	#905 from bitwangyaoyao:2.4_TVL1
	#902 from apavlenko:fix_run_py
	#882 from pengx17:2.4_rewrite_query_info

Conflicts:
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/tvl1flow.cpp

2013-05-27 16:58:04 +04:00

..

include/opencv2

Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex

2013-05-22 12:57:04 +04:00

misc

'aapt' tool moved in SDK r22, adding support to run.py

2013-05-19 14:57:21 +04:00

src

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

CMakeLists.txt

Move cv::KeyPoint and cv::DMatch to core

2013-03-26 16:08:43 +04:00