Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows

author Roman Donchenko <roman.donchenko@itseez.com>

Fri, 14 Jun 2013 11:46:23 +0000 (15:46 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Fri, 14 Jun 2013 11:46:25 +0000 (15:46 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Fri, 14 Jun 2013 11:46:23 +0000 (15:46 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Jun 2013 11:46:25 +0000 (15:46 +0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/OpenCVUtils.cmake
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Fri, 14 Jun 2013 11:46:23 +0000 (15:46 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Fri, 14 Jun 2013 11:46:25 +0000 (15:46 +0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVUtils.cmake	patch \|	diff1 \|	diff2 \|	blob \| history