diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-12-02 10:07:59 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-12-02 10:35:27 (GMT) |
| commit | 697f2f96eccaaf9feb2f6e92603e86e30e67cdb8 (patch) | |
| tree | cd86256a858850d1f115ddd2864403553f237a8d /src/gui/kernel/qsound.cpp | |
| parent | 34f199a1267ea923df33690b50920ef3383b85c2 (diff) | |
| download | Qt-697f2f96eccaaf9feb2f6e92603e86e30e67cdb8.zip Qt-697f2f96eccaaf9feb2f6e92603e86e30e67cdb8.tar.gz Qt-697f2f96eccaaf9feb2f6e92603e86e30e67cdb8.tar.bz2 | |
Restore patch that got lost in merge
The merge was:
e50e811461b54e07184af547f62aa44b3c5bb681
The parts of these commits was lost in the manual merge:
46d2d05e3a95eefae1c72f55d57cbea4ce27d14e
8e8bae1f4faf676b6104bbf9039ad10f139fa7e8
344a4dcfe847dd778c33d1a852381672dd331409
e45c4387ae16627d61e30a58ae901d888d375aa7
And I also added a license header to qfontengine_coretext.mm
Reviewed-by: paul
Diffstat (limited to 'src/gui/kernel/qsound.cpp')
0 files changed, 0 insertions, 0 deletions