Merge remote-tracking branch 'upstream/master'
authorTony <exocoder@gmail.com>
Tue, 25 Mar 2014 20:44:06 +0000 (20:44 +0000)
committerTony <exocoder@gmail.com>
Tue, 25 Mar 2014 20:44:06 +0000 (20:44 +0000)
commit46ba9d30b97e79473f2551f108a04f1d07cf3d59
tree2eaa6126255d3677195cc358a0a050145561be8d
parent69dc8405832e971c4642d4219d36419f2f8a99c9
parentd63a8ba018d7ed0f019707a07565bc3eedd43166
Merge remote-tracking branch 'upstream/master'
CMakeLists.txt
cmake/OpenCVMinDepVersions.cmake
cmake/templates/cvconfig.h.in
modules/highgui/CMakeLists.txt
modules/highgui/src/window.cpp