diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-06-03 15:16:59 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-06-03 15:16:59 (GMT) |
| commit | c1af1b23442f6d879d3f7eb8c193935f9887244a (patch) | |
| tree | 589b24e3d35bf60e4208a50067e07dcae5a01137 /src/gui | |
| parent | 4f6c82fe55c0ac0600c1894283541d010289480f (diff) | |
| download | Qt-c1af1b23442f6d879d3f7eb8c193935f9887244a.zip Qt-c1af1b23442f6d879d3f7eb8c193935f9887244a.tar.gz Qt-c1af1b23442f6d879d3f7eb8c193935f9887244a.tar.bz2 | |
Fix merge
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 542ad43..3921331 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** +1** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** @@ -1102,7 +1102,6 @@ void QApplication::symbianResourceChange(int type) #endif default: ->>>>>>> master:src/gui/kernel/qapplication_s60.cpp break; } } |