1. 18 Aug, 2014 1 commit
    • Ernest Galbrun's avatar
      merged new master branch · 6207d338
      Ernest Galbrun authored
      changed tests for tvl1 optflow
      correction of a bug preventing compilation with cuda (fmin changed to fminf)
      6207d338
  2. 17 Jul, 2014 19 commits
  3. 16 Jun, 2014 1 commit
  4. 12 Oct, 2013 1 commit
  5. 06 Sep, 2013 1 commit
    • Vladislav Vinogradov's avatar
      Merge branch 'master' into gpu-cuda-rename · 0c7663eb
      Vladislav Vinogradov authored
      Conflicts:
      	modules/core/include/opencv2/core/cuda.hpp
      	modules/cudacodec/src/thread.cpp
      	modules/cudacodec/src/thread.hpp
      	modules/superres/perf/perf_superres.cpp
      	modules/superres/src/btv_l1_cuda.cpp
      	modules/superres/src/optical_flow.cpp
      	modules/videostab/src/global_motion.cpp
      	modules/videostab/src/inpainting.cpp
      	samples/cpp/stitching_detailed.cpp
      	samples/cpp/videostab.cpp
      	samples/gpu/stereo_multi.cpp
      0c7663eb
  6. 02 Sep, 2013 5 commits