Merge branch 'master' into openjpeg-2.1
authorAntonin Descampe <antonin@gmail.com>
Sat, 23 Jan 2016 18:51:16 +0000 (19:51 +0100)
committerAntonin Descampe <antonin@gmail.com>
Sat, 23 Jan 2016 18:51:16 +0000 (19:51 +0100)
commitc84747e580eee040d13f7806f209e34244a14b88
tree647378cdd41243a0c0c2bed24ce2d9b5bfffccfd
parentcf77ede84c88dae8ca30eb2e3504a9ebda08c04f
parent3767af52deaa8e75c322961aa51f56b397de22af
Merge branch 'master' into openjpeg-2.1