Merge pull request #240 from emchristiansen:javatest2.4
-rw-r--r-- 1601 .gitattributes
-rw-r--r-- 69 .gitignore
drwxr-xr-x - 3rdparty
-rw-r--r-- 38121 CMakeLists.txt
-rw-r--r-- 187 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-- 499 index.rst
drwxr-xr-x - ios
drwxr-xr-x - modules
drwxr-xr-x - samples