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

Merge commit 'origin/1.2'

Browse Source 
Conflicts:
	src/plugins/coreplugin/welcomemode.ui
This commit is contained in:
con
2009-06-03 11:36:49 +02:00
parent 313cb44e1d 7b1655049a
commit 2ac1f797ad
77 changed files with 606 additions and 1860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cpptools/CppTools.pluginspec
View File

@@ -1,4 +1,4 @@
<plugin name="CppTools" version="1.1.80" compatVersion="1.1.80">
<plugin name="CppTools" version="1.2.0" compatVersion="1.2.0">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Tools for analyzing C/C++ code.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.80"/>
<dependency name="ProjectExplorer" version="1.1.80"/>
<dependency name="QuickOpen" version="1.1.80"/>
<dependency name="TextEditor" version="1.2.0"/>
<dependency name="ProjectExplorer" version="1.2.0"/>
<dependency name="QuickOpen" version="1.2.0"/>
</dependencyList>
</plugin>