Andrey Kamaev 82d7292ee7 Merge pull request #680 from vpisarev:c2cpp_video_take2

2013-03-22 19:34:53 +04:00

..

app/nv_perf_test

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

doc

Merge branch '2.4'

2013-03-21 23:11:54 +04:00

include/opencv2

Merge branch '2.4'

2013-03-21 23:11:54 +04:00

misc

removed obsolete CARMA toolchain and CMake variable

2013-02-14 16:27:17 +04:00

perf

Merge pull request #680 from vpisarev:c2cpp_video_take2

2013-03-22 19:34:53 +04:00

perf4au

Merge branch '2.4'

2013-03-21 23:11:54 +04:00

src

Merge branch '2.4'

2013-03-21 23:11:54 +04:00

test

Merge pull request #680 from vpisarev:c2cpp_video_take2

2013-03-22 19:34:53 +04:00

CMakeLists.txt

Merge branch '2.4'

2013-03-21 23:11:54 +04:00