diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-13 12:22:12 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-13 12:49:31 +0200 |
commit | a81093b9150b2f1727de6e9e77b8bdddb1c909ee (patch) | |
tree | 503ca465bbb633758c67e1f96987ed375f3c95ad /src/gui/image/qpixmapdata_p.h | |
parent | 2770415f921d494e30e9a770c40b538d223351d6 (diff) | |
parent | 718153cfa03f336be2557da058c879de63cfa792 (diff) |
Merge remote-tracking branch 'origin/master' into refactor
Change-Id: I53c78056abde99198ffe1c67f7f9e90b4b08051d
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
0 files changed, 0 insertions, 0 deletions