fix previous merge error
authorkrodyush <konstantin.rodyushkin@intel.com>
Mon, 7 Apr 2014 13:32:39 +0000 (17:32 +0400)
committerkrodyush <konstantin.rodyushkin@intel.com>
Mon, 7 Apr 2014 13:32:39 +0000 (17:32 +0400)
commit616ec74beb74a7f26df87f51e3c8c3f798da7bb8
treecc985a91501d2dd78ac24502c19d8213675fa62d
parent4ca695cab0cd3046c900c1189da65bb4b9b7cec0
fix previous merge error
modules/video/src/opencl/pyrlk.cl