Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:16:07 +0000 (14:16 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:16:07 +0000 (14:16 +0400)
commit0734d9b877e906bf0e68c1a6c126e84afe43a9f6
tree2903c9978d039a7ebc079e6674c1cdd7ae88f5b2
parent9de36c55921ac697a6944e5050e4c289a56cb7a4
parent2b4ffd1161e08e141b6ea978f65771ba76d56d9f
Merge branch '2.4'
doc/tutorials/introduction/windows_install/windows_install.rst
modules/highgui/src/loadsave.cpp