diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 14:59:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 14:59:19 (GMT) |
| commit | e09c61235dab9de1111372ee05eb51004eda5569 (patch) | |
| tree | bb9b6d404e1a3e6bedac121096d9a1076eb80655 /doc | |
| parent | 64a360f45ab9a1c50ca628cfd6b670b93816c756 (diff) | |
| parent | 06add85eb8a9bd8f53acd162ce665d46e7ebc137 (diff) | |
| download | Qt-e09c61235dab9de1111372ee05eb51004eda5569.zip Qt-e09c61235dab9de1111372ee05eb51004eda5569.tar.gz Qt-e09c61235dab9de1111372ee05eb51004eda5569.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Regressions in Global Object prototype access
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
Autotest: fix paths on the test server after update.
Fix typo in docs.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/internationalization/linguist-manual.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/internationalization/linguist-manual.qdoc b/doc/src/internationalization/linguist-manual.qdoc index 678eb09..424dec2 100644 --- a/doc/src/internationalization/linguist-manual.qdoc +++ b/doc/src/internationalization/linguist-manual.qdoc @@ -724,7 +724,7 @@ causes an application to perform an action. There are two kinds of keyboard accelerators: Alt key and Ctrl key accelerators. - \section3 Alt Key Accellerators + \section3 Alt Key Accelerators Alt key accelerators are used in menu selection and on buttons. The underlined character in a menu item or button label signifies |