Fixed merge conflicts. 3.1.1.0
authorDevangi Parikh <a0132717@ti.com>
Thu, 17 Mar 2016 21:24:38 +0000 (16:24 -0500)
committerDevangi Parikh <a0132717@ti.com>
Thu, 17 Mar 2016 21:24:38 +0000 (16:24 -0500)
commit38dc87122e43f025f7847edcc3224cd10162f870
treede544cf46c95ff07deb08b379bccca24ad3ea4a5
parentb62f4b7f84ee7fcf392802d1bcd60c9ee977a598
Fixed merge conflicts.
modules/core/src/ocl.cpp