diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 13:00:01 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-27 17:43:53 +0000 |
| commit | 69817f6ad13e94ed51b15488b18bafe9b7f44c26 (patch) | |
| tree | b2ac7843ac557dc071560518fc9c705901c3fbb4 /src/gui/text/qrawfont.cpp | |
| parent | d6ecdb434410ffda64058cdb51483786f5af9932 (diff) | |
| parent | ea5f40a7880946dd5e3346235d1a8e1a1a8fd42e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/text/qrawfont.cpp')
0 files changed, 0 insertions, 0 deletions