diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-02-24 15:15:39 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-02-24 15:15:39 +0100 |
| commit | 3fcb20d6bb86c85dbedf91111e10822b8323fe50 (patch) | |
| tree | 221ae2edc619cffa7ca9e7b9fba2f1f25424fb64 /src/plugins/vcsbase | |
| parent | cf66237c133625a40385299af081939dc9dfb6bd (diff) | |
| parent | 7ec95338d5be50b88eb4ea227cadf42b2d1fda6b (diff) | |
| download | qt-creator-3fcb20d6bb86c85dbedf91111e10822b8323fe50.tar.gz | |
Merge branch '1.0.0' into master-master
Conflicts:
src/plugins/debugger/debugger.pro
src/plugins/debugger/gdbengine.cpp
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/VCSBase.pluginspec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec index 60d6b72f71..9fc296fd73 100644 --- a/src/plugins/vcsbase/VCSBase.pluginspec +++ b/src/plugins/vcsbase/VCSBase.pluginspec @@ -1,12 +1,12 @@ -<plugin name="VCSBase" version="0.9.2" compatVersion="0.9.2"> +<plugin name="VCSBase" version="1.0.0" compatVersion="1.0.0"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008-2009 Nokia Corporation</copyright> <license>Nokia Beta Version License</license> <description>Version Control System Base Plugin</description> <url>http://www.trolltech.com/</url> <dependencyList> - <dependency name="Core" version="0.9.2"/> - <dependency name="TextEditor" version="0.9.2"/> - <dependency name="ProjectExplorer" version="0.9.2"/> + <dependency name="Core" version="1.0.0"/> + <dependency name="TextEditor" version="1.0.0"/> + <dependency name="ProjectExplorer" version="1.0.0"/> </dependencyList> </plugin> |