Merge branch '0.9.2-rc1'

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
This commit is contained in:
con
2009-02-04 21:34:12 +01:00
49 changed files with 154 additions and 66 deletions

View File

@@ -1,6 +1,6 @@
<plugin name="ScmGit" version="0.9.2" compatVersion="0.9.2">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008 Nokia Corporation</copyright>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license>
<description>Git integration.</description>
<url>http://www.trolltech.com/</url>