]> granicus.if.org Git - openjpeg/commitdiff
Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Mon, 5 Oct 2015 19:50:59 +0000 (21:50 +0200)
committermayeut <mayeut@users.noreply.github.com>
Mon, 5 Oct 2015 19:50:59 +0000 (21:50 +0200)

Trivial merge