Dan Williams
							
						 
					 | 
					
						
						
						
						
							
						
						
							db90d4a209
							
						
					 | 
					
						
						
							
							Use random port for local models, clean up some model code, and don't double-register models when we hear our own announcement
						
						
						
						
						
					 | 
					
						2006-06-23 13:13:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marco Pesenti Gritti
							
						 
					 | 
					
						
						
						
						
							
						
						
							59f25b0741
							
						
					 | 
					
						
						
							
							Get one-to-one chat to actually work...
						
						
						
						
						
					 | 
					
						2006-06-22 18:07:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marco Pesenti Gritti
							
						 
					 | 
					
						
						
						
						
							
						
						
							c234b7b4a3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar
						
						
						
						
						
						
						
						Conflicts:
	sugar/presence/Buddy.py 
						
					 | 
					
						2006-06-22 16:01:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marco Pesenti Gritti
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a305004b0
							
						
					 | 
					
						
						
							
							Some work getting the one-to-one chat back
						
						
						
						
						
					 | 
					
						2006-06-22 15:59:38 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dan Williams
							
						 
					 | 
					
						
						
						
						
							
						
						
							2840af85ce
							
						
					 | 
					
						
						
							
							Stop abusing ZeroConf by overloading the service type field; overload the service name field instead like everyone else does
						
						
						
						
						
					 | 
					
						2006-06-22 14:05:38 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marco Pesenti Gritti
							
						 
					 | 
					
						
						
						
						
							
						
						
							37ad383be3
							
						
					 | 
					
						
						
							
							Forgot to add these
						
						
						
						
						
					 | 
					
						2006-06-21 16:06:56 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marco Pesenti Gritti
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ea6805174
							
						
					 | 
					
						
						
							
							More work on packages refactoring, mostly working
						
						
						
						
						
					 | 
					
						2006-06-21 16:05:52 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marco Pesenti Gritti
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4e2791c89
							
						
					 | 
					
						
						
							
							Big refactor of the directory structure and packages to
						
						
						
						
						
						
						
						reflect private/public 
						
					 | 
					
						2006-06-21 14:23:18 -04:00 | 
					
					
						
						
							
							
							
						
					 |