Merge remote-tracking branch 'uclouvain/master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Tue, 8 Sep 2015 20:33:07 +0000 (22:33 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 8 Sep 2015 20:33:07 +0000 (22:33 +0200)
commit66d890bf225a4edc49658803b4aa6a65031479e4
treea52c7bb60ab709ff4e7deff1e1b159bea5ddec30
parent0a4ac0852afe7a43e52c48dc33bae126171f5f1e
parente71247bb90085155559fafaf088d4e573add7156
Merge remote-tracking branch 'uclouvain/master' into coc-qcc
src/lib/openjp2/j2k.c