Merge pull request #1704 from SpecLad:merge-2.4
[profile/ivi/opencv.git] / modules / ocl / src / opencl / arithm_addWeighted.cl
2013-10-29 Roman DonchenkoMerge pull request #1704 from SpecLad:merge-2.4
2013-10-28 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-10-25 Roman DonchenkoMerge pull request #1697 from SpecLad:sdk-redux
2013-10-25 Andrey PavlenkoMerge pull request #1655 from pengx17:2.4_opt_superres_ocl
2013-10-25 Andrey PavlenkoMerge pull request #1689 from ilya-lavrenov:ocl_bilater...
2013-10-25 Andrey PavlenkoMerge pull request #1692 from ilya-lavrenov:ocl_separab...
2013-10-25 Andrey PavlenkoMerge pull request #1694 from apavlenko:fix_typo
2013-10-25 Andrey Pavlenkofixing typo
2013-10-21 Roman DonchenkoMerge pull request #1540 from jet47:gpuarithm-cudev
2013-10-21 Roman DonchenkoMerge pull request #1492 from jet47:gpucodec-cudev
2013-10-21 Roman DonchenkoMerge pull request #1534 from jet47:fix-cuda-5.0-build
2013-10-18 Roman DonchenkoMerge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
2013-10-17 Roman DonchenkoMerge tag '2.4.6.2' into 2.4
2013-10-17 Roman DonchenkoMerge pull request #1369 from StevenPuttemans:fix_featu...
2013-10-16 Roman DonchenkoMerge pull request #1375 from jet47:gpu-examples-build
2013-10-14 Roman DonchenkoMerge pull request #1450 from adrians:neon-pull3
2013-10-07 Roman DonchenkoMerge pull request #1569 from ilya-lavrenov:ocl_hough_c...
2013-10-04 Roman DonchenkoMerge pull request #1536 from asmorkalov:android_ndk_r9...
2013-10-03 Roman DonchenkoMerge pull request #1527 from vpisarev:shape_module
2013-10-02 Andrey PavlenkoMerge pull request #1507 from pengx17:2.4_fix_test
2013-10-02 Roman DonchenkoMerge pull request #1543 from SpecLad:name-enum
2013-10-02 Roman DonchenkoMerge pull request #1541 from SpecLad:merge-2.4
2013-10-02 Roman DonchenkoMerge remote-tracking branch 'origin/master' into merge-2.4
2013-10-01 Roman DonchenkoMerge branch 'master' into merge-2.4
2013-10-01 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-09-30 Roman DonchenkoMerge pull request #1509 from perping:2.4_docs
2013-09-26 Andrey PavlenkoMerge pull request #1503 from ilya-lavrenov:ocl_arithm
2013-09-24 Alexander SmorkalovMerge pull request #1199 from devernay:2.4-qtkit
2013-09-24 Ilya Lavrenovrefactored and extended ocl::addWeighted
2013-09-15 Ozan Tonkalmerge with Itseez/opencv
2013-09-03 Roman DonchenkoMerge pull request #1283 from melody-rain:new_mog_mog2
2013-09-02 Roman DonchenkoMerge pull request #1300 from kdrobnyh:FilterBilateral
2013-09-02 Roman DonchenkoMerge pull request #1302 from kdrobnyh:compare
2013-08-30 Roman DonchenkoMerge pull request #1236 from pengx17:2.4_fix_retina_co...
2013-08-29 kdrobnyhMerge pull request #5 from Itseez/2.4
2013-08-28 Roman DonchenkoMerge pull request #1213 from kdrobnyh:color
2013-08-27 Roman DonchenkoMerge commit '43aec5ad^' into merge-2.4
2013-08-27 Roman DonchenkoMerge pull request #1267 from clhsieh:gpu_example_build...
2013-08-26 Roman DonchenkoMerge pull request #1311 from leszekhanusz:png_palette_...
2013-08-23 Roman DonchenkoMerge pull request #1234 from SpecLad:ios-plist
2013-08-23 Roman DonchenkoMerge pull request #1332 from pengx17:2.4_fix_parallel
2013-08-22 Roman DonchenkoMerge pull request #1321 from asmorkalov:winrt_mode_war...
2013-08-22 Roman DonchenkoMerge pull request #1317 from jet47:gpu-tvl1-optimization
2013-08-22 Roman DonchenkoMerge pull request #1318 from SpecLad:wow
2013-08-21 Roman DonchenkoDeleted all trailing whitespace.
2013-08-19 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-08-13 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-08-06 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-07-22 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-07-16 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-07-08 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-07-03 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-06-25 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-06-19 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-06-13 Roman DonchenkoMerge pull request #696 from znah:detect_method
2013-06-10 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-06-05 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-05-27 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-05-22 Roman DonchenkoMerge commit 'b51a1a7d' (PR #895 from 2.4)
2013-05-21 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-04-29 alexandre benoitresolved conflicts, updated retina class interface...
2013-04-17 Andrey KamaevMerge branch '2.4'
2013-04-12 Andrey KamaevMerge branch '2.4'
2013-04-12 Andrey KamaevMerge pull request #808 from bitwangyaoyao:2.4_mac
2013-04-12 Andrey KamaevMerge pull request #804 from gpsinghsandhu:staticCast
2013-04-12 Vadim PisarevskyMerge pull request #806 from bitwangyaoyao:2.4_fix
2013-04-11 Andrey KamaevMerge pull request #742 from bitwangyaoyao:2.4_fix
2013-04-11 Andrey KamaevMerge pull request #740 from evil0sheep:2.4
2013-04-09 Andrey KamaevMerge pull request #776 from virtuald:2.4
2013-04-08 Andrey KamaevMerge pull request #779 from sivapvarma:master
2013-04-08 Andrey KamaevMerge pull request #780 from sivapvarma:2.4
2013-04-05 Andrey KamaevMerge branch '2.4'
2013-04-05 Andrey KamaevMerge pull request #778 from asmorkalov:android_wanr_fix
2013-04-05 Andrey KamaevMerge pull request #777 from taka-no-me:ocl_win_hang
2013-04-05 Andrey KamaevMerge pull request #775 from bitwangyaoyao:2.4_fixerr
2013-04-05 yaofix all redefine build errors on some Intel OCL
2013-04-03 Andrey KamaevMerge pull request #716 from asmorkalov:winrt
2013-03-26 Andrey KamaevMerge pull request #692 from vpisarev:refactor_calib3d_...
2013-03-25 Andrey KamaevMerge pull request #684 from vhdirk:gstreamer-1.x
2013-03-22 Andrey KamaevMerge pull request #690 from berak:master
2013-03-22 Andrey KamaevMerge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 Andrey KamaevMerge pull request #691 from vpisarev:fix_2899
2013-03-22 Vadim PisarevskyMerge pull request #687 from vpisarev:fast_lin_svm2
2013-03-21 Andrey KamaevMerge branch '2.4'
2013-03-21 Andrey KamaevMerge pull request #664 from taka-no-me/ocl
2013-03-21 Andrey KamaevAllow OpenCL acceleration in every OpenCV module