diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:04:15 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:04:15 +0200 |
commit | 454c0df87b3699c4291c324f786698864ba171fa (patch) | |
tree | ecfef2a73967266f7bfe1f1aab86b3c62ea36818 /src/3rdparty/jasper/src/libjasper/mif/mif_cod.c | |
parent | 78cc93d132cb99228fd41beb787879f811eda8f9 (diff) | |
parent | 3e081dbc87eb3872197f56ddea8f55edf9c8aa3b (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia9b757e38918f7d6612a04112e46c5c121af7157
Diffstat (limited to 'src/3rdparty/jasper/src/libjasper/mif/mif_cod.c')
0 files changed, 0 insertions, 0 deletions