diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-22 13:38:28 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-22 13:38:28 (GMT) |
| commit | e102acd25673f0fd6e281f3244093200c8802c90 (patch) | |
| tree | 78a1b011561326ec4e030fd43c679ffe0f6f2582 /doc/src/snippets/code/src_script_qscriptvalue.cpp | |
| parent | 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d (diff) | |
| download | Qt-e102acd25673f0fd6e281f3244093200c8802c90.zip Qt-e102acd25673f0fd6e281f3244093200c8802c90.tar.gz Qt-e102acd25673f0fd6e281f3244093200c8802c90.tar.bz2 | |
Fix merge of qtextureglyphcache.cpp
The merge in 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d introdcued
two different versions of the m_cy calculation simultaneously. Remove
the older version and keep the new.
Reviewed-by: TrustMe
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptvalue.cpp')
0 files changed, 0 insertions, 0 deletions