Alexander Alekhin 23e53a32e5 Merge pull request #7950 from BadrinathS:firstbugfix-lr_opencv

2016-12-31 12:48:54 +00: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 #7950 from BadrinathS:firstbugfix-lr_opencv

2016-12-31 12:48:54 +00:00

test

Add JSON support.

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

CMakeLists.txt

…