Merge branch 'master' into openjpeg-2.1
-rw-r--r-- 2779 .travis.yml
-rw-r--r-- 662 AUTHORS
-rw-r--r-- 14205 CMakeLists.txt
-rw-r--r-- 234 CTestConfig.cmake
-rw-r--r-- 2779 INSTALL
-rw-r--r-- 2112 LICENSE
-rw-r--r-- 1915 NEWS
-rw-r--r-- 5210 README.md
-rw-r--r-- 656 THANKS
-rw-r--r-- 1092 appveyor.yml
drwxr-xr-x - cmake
drwxr-xr-x - doc
drwxr-xr-x - src
drwxr-xr-x - tests
drwxr-xr-x - thirdparty
drwxr-xr-x - tools
drwxr-xr-x - wrapping