Roman Donchenko 65389e41db Revert commit 994e07db0 (PR #1715), because it's irrelevant for master. ...

Conflicts:
	modules/java/generator/src/cpp/VideoCapture.cpp

2013-11-06 12:32:03 +04:00

..

android_lib

Merge pull request #800 from asmorkalov:android_cam_idx_semantic

2013-04-29 10:00:08 +04:00

android_test

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-09-10 11:30:19 +04:00

generator

Revert commit 994e07db0 (PR #1715), because it's irrelevant for master.

2013-11-06 12:32:03 +04:00

test

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +04:00

build.xml.in

Fix for encoding errors when building Java source

2013-03-27 17:43:00 +04:00

check-tests.py

Normalized file endings.

2013-08-21 18:59:25 +04:00

CMakeLists.txt

Revert commit 994e07db0 (PR #1715), because it's irrelevant for master.

2013-11-06 12:32:03 +04:00