Merged the trunk r8517:8524
authorAndrey Kamaev <no@email>
Thu, 31 May 2012 10:53:28 +0000 (10:53 +0000)
committerAndrey Kamaev <no@email>
Thu, 31 May 2012 10:53:28 +0000 (10:53 +0000)
commitdaad7900e2f4ff7b26ca282a0ed25201997c0d18
tree6bfc5931cde635c528ea8adeb291cf0bfd78fff6
parent9ad470ba5c6e1bdd3e28ea7e36004f90f2141074
Merged the trunk r8517:8524
doc/CMakeLists.txt
modules/features2d/src/fast.cpp
modules/features2d/src/orb.cpp
modules/features2d/test/test_features2d.cpp
modules/highgui/doc/user_interface.rst
modules/imgproc/src/color.cpp
modules/imgproc/src/imgwarp.cpp
modules/refman.rst [deleted file]
modules/refman.rst.in [new file with mode: 0644]