Merge branch 'master' into openjpeg-2.1
authorAntonin Descampe <antonin@gmail.com>
Mon, 25 Jan 2016 16:55:01 +0000 (17:55 +0100)
committerAntonin Descampe <antonin@gmail.com>
Mon, 25 Jan 2016 16:55:01 +0000 (17:55 +0100)
commit9701c1932380e7f74fdb203148fdb07c20759c3d
tree7a28a85ac7a3b2c964cca7bb59bc5b9c3eb1e58d
parentc84747e580eee040d13f7806f209e34244a14b88
parent5c5ae1d51a3b5a1c4e68ae0323f7a14d7628f465
Merge branch 'master' into openjpeg-2.1