Merge remote-tracking branch 'origin/2.4' into merge-2.4
[platform/upstream/opencv.git] / modules / ocl / test / main.cpp
2013-07-03 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-07-01 Roman DonchenkoMerge pull request #1051 from pengx17:2.4_fback_ocl
2013-07-01 Roman DonchenkoMerge pull request #1061 from bitwangyaoyao:2.4_fix2
2013-06-28 yaoformat the ocl's samples name
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-10 Vadim PisarevskyMerge pull request #856 from ericgreveson:master
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-22 Andrey PavlenkoMerge pull request #797 from vhdirk:installheaders
2013-05-21 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-05-14 Vadim PisarevskyMerge pull request #823 from pickle27:starter_image_seq...
2013-05-13 Vadim PisarevskyMerge pull request #874 from pengx17:master_queryDevice...
2013-05-13 Andrey PavlenkoMerge pull request #840 from pablospe:master
2013-05-12 Vadim PisarevskyMerge pull request #841 from Pastafarianist:patch-1
2013-05-12 Vadim PisarevskyMerge pull request #845 from githubuser0xFFFF:master
2013-05-12 Vadim PisarevskyMerge pull request #848 from pengx17:master_ocl_platfor...
2013-04-29 alexandre benoitresolved conflicts, updated retina class interface...
2013-04-29 Andrey PavlenkoMerge pull request #800 from asmorkalov:android_cam_idx...
2013-04-25 peng xiaoAdd ocl::PlatformName to ocl::Info.
2013-04-17 Andrey KamaevMerge branch '2.4'
2013-04-13 Andrey KamaevMerge pull request #810 from pengx17:master_fix_ocl_tmflag
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 #781 from bitwangyaoyao:2.4_fixerr
2013-04-11 Andrey KamaevMerge pull request #796 from SpecLad:more-backports
2013-04-11 Andrey KamaevMerge pull request #793 from SpecLad:auto-cuda
2013-04-11 Andrey KamaevMerge pull request #794 from asmorkalov:android_no_layout
2013-04-11 Andrey KamaevMerge pull request #792 from asmorkalov:manager_incompat_wh
2013-04-11 Andrey KamaevMerge pull request #742 from bitwangyaoyao:2.4_fix
2013-04-05 Andrey KamaevMerge branch '2.4'
2013-04-05 yaoFix the problem of device selection on hybrid video...
2013-03-29 Andrey KamaevMerge branch '2.4'
2013-03-21 Andrey KamaevMerge branch '2.4'
2013-03-11 Andrey KamaevMerge branch '2.4'
2013-03-04 Andrey KamaevMerge release 2.4.4
2013-02-28 Andrey KamaevMerge branch '2.4'
2013-02-24 Andrey KamaevMerge branch 2.4
2013-02-22 Andrey KamaevMerge branch '2.4'
2013-02-20 Andrey KamaevMerge branch '2.4'
2013-02-18 Andrey KamaevMerge branch '2.4'
2013-02-12 Andrey KamaevMerge branch '2.4'
2013-02-12 Andrey KamaevMerge branch '2.4'
2013-02-04 Andrey KamaevMerge branch 2.4
2013-02-01 Andrey KamaevMerge branch '2.4'
2013-01-31 Andrey KamaevMerge branch '2.4'
2013-01-30 Andrey KamaevMerge branch '2.4'
2013-01-29 Andrey KamaevMerge branch '2.4'
2013-01-29 Andrey KamaevMerge branch '2.4'
2013-01-29 Andrey KamaevMerge branch '2.4'
2013-01-25 Andrey KamaevMerge branch '2.4'
2013-01-17 Andrey KamaevMerge branch 2.4
2013-01-11 Andrey KamaevMerge branch 2.4
2012-12-25 Andrey KamaevMerge release 2.4.3.2
2012-12-24 Andrey KamaevMerge branch 2.4
2012-12-21 Andrey KamaevMerge branch 2.4
2012-12-15 Vadim PisarevskyMerge branch 'master' of https://github.com/nevion...
2012-12-14 Andrey KamaevMerge branch 2.4
2012-12-10 Andrey KamaevMerge branch 2.4
2012-12-10 Andrey KamaevMerge pull request #203 from asmorkalov/android_cam_stub
2012-11-30 Andrey KamaevMerge branch 2.4
2012-11-28 Andrey KamaevMerge pull request #166 from askforeric:pvapi_updates
2012-11-27 Vladislav VinogradovMerge branch 'kepler-optimization' into cuda-dev
2012-11-27 Ilya LavrenovMerge remote-tracking branch 'upstream/master' into...
2012-11-26 marina.kolpakovaMerge cuda-geek/soft-cascade-gpu into cuda-dev
2012-11-26 marina.kolpakovaMerge origin/master into cuda-dev
2012-11-20 Andrey KamaevMerge branch 2.4
2012-11-14 Andrey KamaevMerge pull request #128 from LeonidBeynenson/fix_args_c...
2012-11-13 marina.kolpakovaMerge remote-tracking branch 'cuda-geek/soft-cascade...
2012-11-13 Andrey KamaevMerge branch 2.4
2012-11-13 Andrey KamaevMerge pull request #147 from taka-no-me/win_warnings
2012-11-13 Andrey KamaevMerge pull requests #136, #142, #150, #152 from asmorka...
2012-11-07 NikoKJfix the compilation bug of main.cpp in perf test and...
2012-10-22 Andrey KamaevMerge branch '2.4'
2012-10-22 Andrey KamaevMerge pull request #55 from vpisarev/ocl_fixes
2012-10-22 Andrey KamaevMerge pull request #48 from kazuki-ma/2430_ostream_24
2012-10-22 Vadim PisarevskyMerge pull request #71 from NikoKJ/ocl4_2.4.3
2012-10-22 Nikoremove redundant OPENCL_DIR flag
2012-10-16 Andrey KamaevMerge branch 'release2.4.3' into 2.4
2012-10-12 Andrey KamaevMerge pull request #29 from thorikawa/feature-523
2012-10-12 Andrey KamaevMerge pull request #40 from emchristiansen/manualBRISKFREAK
2012-10-11 Andrey KamaevMerge pull request #34 from roynos/master
2012-10-11 nikoformat files to ANSI C style with coolformat
2012-09-21 nikomany bugs fix for intel's HD4000
2012-09-05 Yury ZemlyanskiyMerge remote-tracking branch 'itseez/opencv'
2012-09-04 Andrey KamaevMerge branch 'android-toolchain'
2012-09-04 Alexander SmorkalovMerge branch 'master' of git://code.opencv.org/opencv
2012-09-03 Andrey KamaevMerge pull request #28: add openexr to 3rdparty libs
2012-09-03 nikoadd channel 3 for test/main.cpp
2012-08-30 nikoperformance fix of convertC3C4
2012-07-16 Vadim Pisarevskymerged ocl module from ocl branch (it's not quite usabl...