hjk 
							
						 
					 
					
						
						
							
						
						8397663964 
					 
					
						
						
							
							Update license.  
						
						
						
						
					 
					
						2011-04-13 11:49:28 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						d1023c7614 
					 
					
						
						
							
							It's 2011 now.  
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2011-01-12 09:46:24 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						b1bcf081d8 
					 
					
						
						
							
							Merge branch '2.1'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp 
						
						
					 
					
						2010-12-17 17:00:53 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						04e32b0049 
					 
					
						
						
							
							License headers.  
						
						
						
						
					 
					
						2010-12-17 16:03:42 +01:00 
						 
				 
			
				
					
						
							
							
								dt 
							
						 
					 
					
						
						
							
						
						8697072ce4 
					 
					
						
						
							
							ProjectExplorer: Move ITargetFactory to object pool  
						
						... 
						
						
						
						Makes multiple target factories per project possible
Reviewed-By: hunger 
						
						
					 
					
						2010-12-07 13:17:12 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						93cbef8724 
					 
					
						
						
							
							long live the king  
						
						
						
						
					 
					
						2009-08-14 09:30:56 +02:00 
						 
				 
			
				
					
						
							
							
								Jason McDonald 
							
						 
					 
					
						
						
							
						
						884b7af769 
					 
					
						
						
							
							Update license headers and sales contact details.  
						
						... 
						
						
						
						Reviewed-by: Trust Me 
						
						
					 
					
						2009-06-17 00:01:27 +10:00 
						 
				 
			
				
					
						
							
							
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						3904b2ad3e 
					 
					
						
						
							
							Class name simplification for MakeStep related classes  
						
						... 
						
						
						
						Was a bit confusing that a MakeStep was constructed by a
MakeBuildStepFactory and configured by a MakeBuildStepConfigWidget.
The MakeStep of the generic project manager was renamed to
GenericMakeStep. 
						
						
					 
					
						2009-03-18 13:55:13 +01:00 
						 
				 
			
				
					
						
							
							
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						93b3dda602 
					 
					
						
						
							
							Fixed member variable prefix to be in line with coding standards  
						
						
						
						
					 
					
						2009-03-18 12:20:06 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						7c537a81ff 
					 
					
						
						
							
							Introduced editors for .files and .includes files.  
						
						
						
						
					 
					
						2009-03-16 11:35:54 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						79169238b1 
					 
					
						
						
							
							Fun with Core::IWizard.  
						
						
						
						
					 
					
						2009-03-12 17:53:25 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						013441d5f4 
					 
					
						
						
							
							Generic project manager.  
						
						
						
						
					 
					
						2009-03-10 17:35:05 +01:00