diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-18 14:19:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-18 14:19:36 +0100 |
| commit | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (patch) | |
| tree | 9ba857247c0862fa6636766fad9cdab146c9c19b /src/gui/text/qfontengine_ft.cpp | |
| parent | f4044e853cdb66a7f7f7e61df78434243b85b03d (diff) | |
| parent | 21fbca97a8ee284ff6ffaff64c180700cc5537ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/android/qandroidplatformtheme.h
Change-Id: I541bd3069df3ab54c7942d5f4a9e155e3b6566a0
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
0 files changed, 0 insertions, 0 deletions