diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-06 10:46:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-06 10:46:50 +0200 |
| commit | 7e739985b25b16af504adb280685c961afbcbcc8 (patch) | |
| tree | 4bd678eaaac49ed580d2ad091c218961a5d08081 /doc/qtcreator.qdoc | |
| parent | 077c9181863e0036ae16772530cd2624af9e7b78 (diff) | |
| parent | 9bad0c01bec3547324bf9340497fb956467a9531 (diff) | |
| download | qt-creator-7e739985b25b16af504adb280685c961afbcbcc8.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/git/gitclient.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
Diffstat (limited to 'doc/qtcreator.qdoc')
| -rw-r--r-- | doc/qtcreator.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index b7b125e99a..5f6b8e8674 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -6558,7 +6558,7 @@ To move forward in the location history, press \key {Alt+Right} (\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left} - (\key {Cmd+Opt+Right} on Mac OS). For example, if you use the \gui Locator + (\key {Cmd+Opt+Left} on Mac OS). For example, if you use the \gui Locator to jump to a symbol in the same file, you can jump back to your original location in that file by pressing \key {Alt+Left}. |