forked from qt-creator/qt-creator
		
	Merge branch '0.9.2-rc1'
Conflicts: src/plugins/coreplugin/editormanager/editormanager.cpp
This commit is contained in:
		@@ -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>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user