diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:02 +0200 |
| commit | 5b1a3318125b72563b5de1bf7549088165ec60f4 (patch) | |
| tree | 1aec8465db302fc7228cfd060d6ee132a99a69bd /src/plugins/imageformats/wbmp/qwbmphandler_p.h | |
| parent | c3035a1655090b0f6b194fb8a7586c013ef24f6a (diff) | |
| parent | 98f83553e9fe2aa5fc54b32513af6ba3aa60a07b (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1
Change-Id: Ib6f1512a15f2714a712ff82df55a9d3de8e46ffd
Diffstat (limited to 'src/plugins/imageformats/wbmp/qwbmphandler_p.h')
0 files changed, 0 insertions, 0 deletions