Merge pull request #2514 from asmorkalov:android_two_libs_cuda
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 24 Mar 2014 08:26:57 +0000 (12:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Mar 2014 08:26:57 +0000 (12:26 +0400)
commitbcb0ee3e4bcaaa578a9eb1c9d5c2db0093adedc2
tree44e88e2d1b9663cdd82d9d36fdc35edd6434a151
parent9aa6528fd72555433831762742e48d45c6b5b920
parent64d679ecb4baddfac73f51f48b2fca6abe5407aa
Merge pull request #2514 from asmorkalov:android_two_libs_cuda