Merge remote-tracking branch 'origin/2.4' into merge-2.4
-rw-r--r-- 1468 .gitattributes
-rw-r--r-- 69 .gitignore
drwxr-xr-x - 3rdparty
-rw-r--r-- 41804 CMakeLists.txt
-rw-r--r-- 504 README
drwxr-xr-x - android
drwxr-xr-x - apps
drwxr-xr-x - cmake
drwxr-xr-x - data
drwxr-xr-x - doc
drwxr-xr-x - include
-rw-r--r-- 509 index.rst
drwxr-xr-x - ios
drwxr-xr-x - modules
drwxr-xr-x - platforms
drwxr-xr-x - samples