Fix rebase errors
authorvbystricky <user@user-pc.(none)>
Mon, 7 Apr 2014 10:43:09 +0000 (14:43 +0400)
committervbystricky <user@user-pc.(none)>
Mon, 7 Apr 2014 10:44:01 +0000 (14:44 +0400)
commite8f79d6e1fd7698600882dadf57fb6cce442d299
treecfb994b5ad9d6b78e7772466c8660e70fe6ea5e9
parentdbdc476b797a86897d09c72dffe74ecf81bead6c
Fix rebase errors
CMakeLists.txt
cmake/OpenCVFindIPP.cmake