berak 89a740a62f Merge pull request #8019 from berak:patch-2 ...

ml: fix small typo in lr.cpp (#8019)

2017-01-17 13:57:50 +03:00

..

doc

…

include/opencv2

Merge pull request #7371 from mshabunin:aruco-java-wrap

2016-10-01 15:38:59 +00:00

misc/python

Adding of user-defined type conversions for python bindings inside module directories

2016-08-16 13:10:17 +03:00

src

Merge pull request #8019 from berak:patch-2

2017-01-17 13:57:50 +03:00

test

Add JSON support.

2016-08-11 00:53:15 +08:00

CMakeLists.txt

…