Roman Donchenko 659d21332e Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/contrib/src/spinimages.cpp

2014-06-09 18:03:03 +04:00

..

linux_install.rst

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-06-09 18:03:03 +04:00