diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-02 18:02:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-02 18:03:05 +0100 |
| commit | 1c72ef507bc7ebdb7e73a26fb52def95b87e3ff5 (patch) | |
| tree | e7142a43d3306f991cfb7deb837ddbde28815db6 /src/plugins/imageformats/webp/main.cpp | |
| parent | 9151e20dd2db7d96df9ef43900668bc814c7305b (diff) | |
| parent | 52dd6b1e9a3fe249b153bdcebe08455ff716309d (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I40e0c61bb296dadc301988dfc36e96c7429a8375
Diffstat (limited to 'src/plugins/imageformats/webp/main.cpp')
0 files changed, 0 insertions, 0 deletions