diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 13:42:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 13:42:15 (GMT) |
| commit | 84c519862aa3a089471af6fd2174b16a88c10844 (patch) | |
| tree | d518b86cdd5c32fc7ab415bd0c862df61f4dd138 /src/gui/text/qtextobject.h | |
| parent | ebecf192abe56c405409343acc2f97eaf9124fc3 (diff) | |
| parent | 763f3acd879648648465475aef773fe0876934a9 (diff) | |
| download | Qt-84c519862aa3a089471af6fd2174b16a88c10844.zip Qt-84c519862aa3a089471af6fd2174b16a88c10844.tar.gz Qt-84c519862aa3a089471af6fd2174b16a88c10844.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Prevent multiple modprobe messages for the same phone
Fix detection of N95 with linux 2.6.34+
Diffstat (limited to 'src/gui/text/qtextobject.h')
0 files changed, 0 insertions, 0 deletions