Alexander Alekhin cc09f5a7de Merge pull request #7854 from alalek:backports_2016 ... (2.4) Backports from master branch (#7854)		2016-12-15 18:09:44 +02:00
..
.gitignore	Normalized file endings.	2013-08-21 18:59:25 +04:00
android_additional.h	Normalize line endings and whitespace	2012-10-17 15:32:23 +04:00
arm_linux_stub.cpp	Code review notes fixed;	2013-02-08 12:42:03 +04:00
CMakeLists.txt	Merge pull request #7854 from alalek:backports_2016	2016-12-15 18:09:44 +02:00
version_string.tmp	Fixed build with TBB for Android	2012-06-08 10:32:51 +00:00
version_string.ver	Fixed build with TBB for Android	2012-06-08 10:32:51 +00:00