diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-09-05 06:49:53 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-09-05 06:49:53 (GMT) |
| commit | a314ecf9b8b4c9b63432df8caf797fa6b28a433d (patch) | |
| tree | ef68e7a557c45f6957150321a70544030d311321 /src/xmlpatterns | |
| parent | 29ceb95f9f1199711ca07ee8d7a1e93b446ab344 (diff) | |
| download | Qt-a314ecf9b8b4c9b63432df8caf797fa6b28a433d.zip Qt-a314ecf9b8b4c9b63432df8caf797fa6b28a433d.tar.gz Qt-a314ecf9b8b4c9b63432df8caf797fa6b28a433d.tar.bz2 | |
Fix a bad merge of qs60style.cpp
Merge cf2f72f4f61f3a9e0e7573379c33bb341eeba7be caused QS60Style.cpp
to pick up unrelated changes from Qt4.7 branch.
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/xmlpatterns')
0 files changed, 0 insertions, 0 deletions