Merge pull request #8856 from mshabunin:media-tests-upgrade
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 22 Jun 2017 11:45:52 +0000 (11:45 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 22 Jun 2017 11:45:52 +0000 (11:45 +0000)
1  2 
cmake/templates/cvconfig.h.in

Simple merge