diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
commit | 627d9cbd3c45834fe7aa1f2ee37fdfca07a03976 (patch) | |
tree | c0805165804b2a9ef809318dd6a84132d2e57744 /src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | |
parent | fed2d237b71ac2f586dca0d35d104e7cf0cd9bd2 (diff) | |
parent | 1b5f9bec03901519db3694d1b51fa7989ade1f25 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm')
0 files changed, 0 insertions, 0 deletions