Alexander Alekhin
|
a4a47b538c
|
build: detect Android via '__ANDROID__' macro
https://sourceforge.net/p/predef/wiki/OperatingSystems
|
2017-07-10 12:43:59 +03:00 |
|
Ilya Lavrenov
|
b0cbec922b
|
port of MR #4061 to master
|
2015-05-26 17:47:03 +03:00 |
|
Roman Donchenko
|
09e154d214
|
Merge commit '60906d917' into merge-2.4
Conflicts:
modules/ts/src/cuda_perf.cpp
|
2013-12-30 16:47:05 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
3c34b24f1f
|
replaced gpu->cuda in files names
|
2013-09-02 14:00:44 +04:00 |
|