diff options
author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-10 16:06:02 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-11-10 16:06:02 +0100 |
commit | 66a36359a7bf3da844c98b88cbcfddeb2b6c343f (patch) | |
tree | cbb14ae219cb876a0f812d14744f09c6d305e66e /src/quick/items/qquickborderimage_p_p.h | |
parent | b5fb59fc5fa8d180daa1cb95f12238657a53bbc2 (diff) | |
parent | fa520d0c86b69d4ff794df51ff498956a477127c (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
Diffstat (limited to 'src/quick/items/qquickborderimage_p_p.h')
0 files changed, 0 insertions, 0 deletions