forked from qt-creator/qt-creator
		
	Merge commit 'origin/1.1'
Conflicts: src/plugins/debugger/debuggeractions.cpp src/plugins/debugger/gdboptionpage.ui
This commit is contained in:
		@@ -235,26 +235,26 @@ examples/xml/xmlstreamlint/xmlstreamlint
 | 
			
		||||
examples/xmlpatterns/filetree/filetree
 | 
			
		||||
examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel
 | 
			
		||||
examples/xmlpatterns/recipes/recipes
 | 
			
		||||
lib/libQt3Support.so.4.5.0
 | 
			
		||||
lib/libQtAssistantClient.so.4.5.0
 | 
			
		||||
lib/libQtCLucene.so.4.5.0
 | 
			
		||||
lib/libQtCore.so.4.5.0
 | 
			
		||||
lib/libQtDBus.so.4.5.0
 | 
			
		||||
lib/libQtDesigner.so.4.5.0
 | 
			
		||||
lib/libQtDesignerComponents.so.4.5.0
 | 
			
		||||
lib/libQtGui.so.4.5.0
 | 
			
		||||
lib/libQtHelp.so.4.5.0
 | 
			
		||||
lib/libQtNetwork.so.4.5.0
 | 
			
		||||
lib/libQtOpenGL.so.4.5.0
 | 
			
		||||
lib/libQtScript.so.4.5.0
 | 
			
		||||
lib/libQtScriptTools.so.4.5.0
 | 
			
		||||
lib/libQtSql.so.4.5.0
 | 
			
		||||
lib/libQtSvg.so.4.5.0
 | 
			
		||||
lib/libQtTest.so.4.5.0
 | 
			
		||||
lib/libQt3Support.so.4.5.1
 | 
			
		||||
lib/libQtAssistantClient.so.4.5.1
 | 
			
		||||
lib/libQtCLucene.so.4.5.1
 | 
			
		||||
lib/libQtCore.so.4.5.1
 | 
			
		||||
lib/libQtDBus.so.4.5.1
 | 
			
		||||
lib/libQtDesigner.so.4.5.1
 | 
			
		||||
lib/libQtDesignerComponents.so.4.5.1
 | 
			
		||||
lib/libQtGui.so.4.5.1
 | 
			
		||||
lib/libQtHelp.so.4.5.1
 | 
			
		||||
lib/libQtNetwork.so.4.5.1
 | 
			
		||||
lib/libQtOpenGL.so.4.5.1
 | 
			
		||||
lib/libQtScript.so.4.5.1
 | 
			
		||||
lib/libQtScriptTools.so.4.5.1
 | 
			
		||||
lib/libQtSql.so.4.5.1
 | 
			
		||||
lib/libQtSvg.so.4.5.1
 | 
			
		||||
lib/libQtTest.so.4.5.1
 | 
			
		||||
lib/libQtUiTools.a
 | 
			
		||||
lib/libQtWebKit.so.4.5.0
 | 
			
		||||
lib/libQtXml.so.4.5.0
 | 
			
		||||
lib/libQtXmlPatterns.so.4.5.0
 | 
			
		||||
lib/libQtWebKit.so.4.5.1
 | 
			
		||||
lib/libQtXml.so.4.5.1
 | 
			
		||||
lib/libQtXmlPatterns.so.4.5.1
 | 
			
		||||
plugins/accessible/libqtaccessiblecompatwidgets.so
 | 
			
		||||
plugins/accessible/libqtaccessiblewidgets.so
 | 
			
		||||
plugins/codecs/libqcncodecs.so
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user