Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
authorkrodyush <konstantin.rodyushkin@intel.com>
Fri, 4 Apr 2014 07:26:08 +0000 (11:26 +0400)
committerkrodyush <konstantin.rodyushkin@intel.com>
Fri, 4 Apr 2014 07:26:08 +0000 (11:26 +0400)
commit4ca695cab0cd3046c900c1189da65bb4b9b7cec0
tree6289695958f7d3630e81138de53fa15386911040
parent65d64af2a8c05746d4e2346d1e224929c09887ad
parent5a3200d513b300f1271dd32bf9d91317bb742077
Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow

Conflicts:
modules/video/src/opencl/pyrlk.cl
modules/video/src/lkpyramid.cpp
modules/video/src/opencl/pyrlk.cl