Merge pull request #1322 from SpecLad:terse
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 23 Aug 2013 08:11:41 +0000 (12:11 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 23 Aug 2013 08:11:41 +0000 (12:11 +0400)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge