con
		
	
	43bccb41ed
	
	
	Merge commit 'origin/1.3'
		
			
			Conflicts:
	src/plugins/debugger/debuggermanager.h
	src/plugins/qmleditor/qmleditorplugin.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
		
	
 
		2009-11-11 16:14:29 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-07-15 12:28:40 +02:00
		 
	
		
			
			
			
			
			
			2009-10-29 17:17:49 +01:00
		 
	
		
			
			
			
			
			
			2009-08-10 15:46:45 +02:00
		 
	
		
			
			
			
			
			
			2009-07-15 12:28:40 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-11-11 14:32:54 +01:00
		 
	
		
			
			
			
			
			
			2009-11-11 14:32:54 +01:00
		 
	
		
			
			
			
			
			
			2009-10-30 13:57:36 +01:00
		 
	
		
			
			
			
			
			
			2009-10-30 13:57:36 +01:00
		 
	
		
			
			
			
			
			
			2009-11-11 14:32:54 +01:00
		 
	
		
			
			
			
			
			
			2009-11-11 14:32:54 +01:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-10-05 11:06:05 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-10-05 11:06:05 +02:00
		 
	
		
			
			
			
			
			
			2009-08-14 09:30:56 +02:00
		 
	
		
			
			
			
			
			
			2009-10-05 11:06:05 +02:00