Skip to content

O
opencv
Switch branch/tag
  1. 29 Nov, 2012 1 commit
  3. 28 Nov, 2012 1 commit
  5. 27 Nov, 2012 5 commits
  7. 26 Nov, 2012 30 commits
  9. 23 Nov, 2012 1 commit
  11. 22 Nov, 2012 1 commit
  13. 20 Nov, 2012 1 commit
    • Andrey Kamaev's avatar
      Merge branch 2.4 · 7f542e39
      Andrey Kamaev authored 
      Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
      7f542e39