On branch gtk3 Changes to be committed: 	modified:   CMakeLists.txt Corrected merge error from last resync
On branch gtk3
Changes to be committed:
	modified:   CMakeLists.txt
Corrected merge error from last resync

opencv/opencv,opencv/opencv,apavlenko/opencv,opencv/opencv,apavlenko/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,apavlenko/opencv,apavlenko/opencv,apavlenko/opencv,apavlenko/opencv,opencv/opencv