Bill King
							
						 
					 | 
					
						
						
							
						
						3593fe08ae
					 | 
					
						
						
							
							tests: add licence headers
						
						
						
						
						
						
					 | 
					
						2011-02-18 14:48:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bill King
							
						 
					 | 
					
						
						
							
						
						9293453ced
					 | 
					
						
						
							
							Merge branch '2.1'
						
						
						
						
						
						
						
						Conflicts:
	tests/auto/fakevim/fakevim.pro 
						
						
					 | 
					
						2010-10-12 10:01:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Kandeler
							
						 
					 | 
					
						
						
							
						
						a48139b8d0
					 | 
					
						
						
							
							SSH: Fix SshConnection::error signal connections.
						
						
						
						
						
						
						
						I recently changed the signal argument, but forgot to update
some of the points of use.
Reviewed-by: kh1 
						
						
					 | 
					
						2010-10-11 15:43:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Kamm
							
						 
					 | 
					
						
						
							
						
						b78c1ef6da
					 | 
					
						
						
							
							Merge remote branch 'origin/2.1'
						
						
						
						
						
						
						
						Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp 
						
						
					 | 
					
						2010-10-11 14:16:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Kandeler
							
						 
					 | 
					
						
						
							
						
						4578e32fe5
					 | 
					
						
						
							
							Tests: Start implementing more thorough SSH test.
						
						
						
						
						
						
					 | 
					
						2010-10-04 17:54:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |