Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Jun 2014 14:03:03 +0000 (18:03 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Jun 2014 14:03:03 +0000 (18:03 +0400)
commit659d21332ec4f1b00660e6d1ad900e8e3caa84db
tree0f78fc1b6ff4fffc12aaaf4a62f4e35b7e0c7f3d
parent150dd39b0881ea9b397e652bcd21561310ce006d
parent4ef311949babe68018c570f342baf30df77c7e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/contrib/src/spinimages.cpp
doc/tutorials/introduction/linux_install/linux_install.rst
modules/contrib/src/spinimages.cpp