Merge remote-tracking branch 'upstream/master'
authorTony <exocoder@gmail.com>
Sun, 13 Apr 2014 09:39:32 +0000 (10:39 +0100)
committerTony <exocoder@gmail.com>
Sun, 13 Apr 2014 09:39:32 +0000 (10:39 +0100)
Rebase to lates upstream

1  2 
cmake/OpenCVFindLibsGUI.cmake

Simple merge