Merge branch 'bgfg-gmg-optimized' into bgfg-gmg-merged
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Thu, 9 Aug 2012 10:55:36 +0000 (14:55 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Thu, 9 Aug 2012 10:55:36 +0000 (14:55 +0400)
commit79ef454c5fd5c53a865a56fd792bddf195913fa7
tree9f9d5a596e242d98b2cc108dd73ac66c89aaba54
parent827fa850f659f8a62c933e7598b24a8c9a621976
parentbfd9e6102a8995fd2ada9e5e91c38296fd383667
Merge branch 'bgfg-gmg-optimized' into bgfg-gmg-merged
modules/gpu/perf_cpu/perf_video.cpp