Merge pull request #684 from vhdirk:gstreamer-1.x
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 25 Mar 2013 13:01:41 +0000 (17:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 25 Mar 2013 13:01:43 +0000 (17:01 +0400)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge