]> granicus.if.org Git - openjpeg/commitdiff
Merge remote-tracking branch 'uclouvain/master'
authormayeut <mayeut@users.noreply.github.com>
Mon, 5 Oct 2015 19:49:39 +0000 (21:49 +0200)
committermayeut <mayeut@users.noreply.github.com>
Mon, 5 Oct 2015 19:49:39 +0000 (21:49 +0200)

Trivial merge