1. 16 Jul, 2013 1 commit
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · feaa12a2
      Roman Donchenko authored
      Conflicts:
      	modules/core/include/opencv2/core/version.hpp
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/ocl/src/initialization.cpp
      	modules/ocl/test/main.cpp
      	modules/superres/CMakeLists.txt
      	modules/superres/src/input_array_utility.cpp
      	modules/superres/src/input_array_utility.hpp
      	modules/superres/src/optical_flow.cpp
      feaa12a2
  2. 15 Jul, 2013 3 commits
  3. 13 Jul, 2013 2 commits
  4. 12 Jul, 2013 8 commits
  5. 11 Jul, 2013 11 commits
  6. 10 Jul, 2013 12 commits
  7. 09 Jul, 2013 3 commits