diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:51:06 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:51:06 +0200 |
commit | dcbd6c64049682fb6cff0e73a5fdd979de7642dd (patch) | |
tree | 70bcc90ab270f07e4a75e5be7ba6083fe64871b8 /src/declarative/util/qdeclarativefontloader.cpp | |
parent | 8c80dd6a9893c6e323ae69b651efd7b629b2714c (diff) | |
parent | 8e7fa2b5aa2e2e4371c4b73926d0e6ad2ebdbd96 (diff) |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452
Diffstat (limited to 'src/declarative/util/qdeclarativefontloader.cpp')
0 files changed, 0 insertions, 0 deletions