Merge branch 'master' into openjpeg-2.1 v2.1.1
authorAntonin Descampe <antonin@gmail.com>
Tue, 5 Jul 2016 14:54:17 +0000 (16:54 +0200)
committerAntonin Descampe <antonin@gmail.com>
Tue, 5 Jul 2016 14:54:17 +0000 (16:54 +0200)
commit53f25200ed696cf5dc71d5fe12faad2570861b20
treeb04fed04dbb7754c371a72d4b5db8f2ad709980a
parent788dff0a3650f8897eaafe951512a4bae63808dd
parentfef144283f070e24a0a8f9e86158ec6353e99cf1
Merge branch 'master' into openjpeg-2.1
README.md