Merge branch 'master' into travis-abi
authormayeut <mayeut@users.noreply.github.com>
Fri, 9 Oct 2015 20:16:37 +0000 (22:16 +0200)
committermayeut <mayeut@users.noreply.github.com>
Fri, 9 Oct 2015 20:16:37 +0000 (22:16 +0200)
commit4123c0ba864fbe0cb52746c4aac18a15c31b1f62
treebe85e495b5c8472f574526a92259c5af1797959f
parent1a9cb9aef71ced7642140b185026984e2e919dc3
parentde0a9ed10302f94e1d0808ab4e88d6152742cb04
Merge branch 'master' into travis-abi
src/lib/openjp2/openjpeg.h