feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
This commit is contained in:
Eike Ziller
2012-09-26 10:01:04 +02:00
parent 996122b7e9 471f44aae3
commit a55d47544a
145 changed files with 4530 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/howto/creator-keyboard-shortcuts.qdoc
View File

@@ -421,10 +421,10 @@
\o Find previous
\o Shift+F3
\row
\o Find next occurence of selected text
\o Find next occurrence of selected text
\o Ctrl+F3
\row
\o Find previous occurence of selected text
\o Find previous occurrence of selected text
\o Ctrl+Shift+F3
\row
\o Replace next

2
doc/src/howto/creator-ui.qdoc
View File

@@ -391,7 +391,7 @@
\o Return to original size
\o Play and pause movies
\o Play and pause animated GIF and MNG images
\endlist

2
doc/src/howto/creator-vcs.qdoc
View File

@@ -245,7 +245,7 @@
\section3 Reverting Changes Using Git
The Git version control system has an index that is used to stage
changes. The index is commited on the next commit. Git allows you to revert
changes. The index is committed on the next commit. Git allows you to revert
back to the state of the last commit as well as to the state staged in the
index.

2
doc/src/howto/qtcreator-faq.qdoc
View File

@@ -197,7 +197,7 @@
sudo apt-get install libgl-dev libglu-dev
\endcode
\section1 Platform Releated Questions
\section1 Platform Related Questions
\bold {Where is application output shown in \QC?}