Andrey Pavlenko 41ae5d5f66 Merge pull request #1867 from ilya-lavrenov:ocl_resize_master

2013-11-27 18:08:11 +04:00

..

ts

Merge pull request #1867 from ilya-lavrenov:ocl_resize_master

2013-11-27 18:08:11 +04:00

ts.hpp

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00