diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
| commit | 63ff7452137958215988d9f2f6066de955500be0 (patch) | |
| tree | d645a26ae9db68cdbf37e9fd997a221c81eea008 /src/plugins/projectexplorer/projectfilewizardextension.cpp | |
| parent | 19c735a4912487e8038f08ea0b617ccce62cd1a3 (diff) | |
| parent | a12a9f491cb31ff5c22f1051bb22ccfef6c65217 (diff) | |
| download | qt-creator-63ff7452137958215988d9f2f6066de955500be0.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/libs/extensionsystem/pluginmanager.cpp
src/libs/extensionsystem/pluginspec.cpp
src/plugins/coreplugin/basefilewizard.cpp
src/plugins/coreplugin/coreplugin.pro
src/plugins/coreplugin/coreplugin.qbs
src/plugins/coreplugin/editormanager/ieditor.cpp
src/plugins/coreplugin/externaltool.cpp
src/plugins/coreplugin/icore.cpp
src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/fakevim/fakevimhandler.cpp
src/plugins/find/ifindfilter.cpp
src/plugins/projectexplorer/buildstep.cpp
src/plugins/projectexplorer/devicesupport/idevice.cpp
src/plugins/projectexplorer/runconfiguration.cpp
src/plugins/vcsbase/vcsbaseeditor.cpp
tests/system/suite_debugger/tst_simple_analyze/test.py
Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
Diffstat (limited to 'src/plugins/projectexplorer/projectfilewizardextension.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectfilewizardextension.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index bb2f72608b..05fd1c2cf3 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -68,10 +68,10 @@ \brief The ProjectFileWizardExtension class implements the post-file generating steps of a project wizard. - Offers: + This class provides the following functions: \list \li Add to a project file (*.pri/ *.pro) - \li Initialize a version control repository (unless the path is already + \li Initialize a version control system repository (unless the path is already managed) and do 'add' if the VCS supports it. \endlist |