sandb
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a9cca6d0c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of git@github.com:sandb/pamela
						
						
						
						
						
						
						
						Conflicts:
	macs.php 
						
						
					 | 
					
						2010-03-21 23:20:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e394ded75
							
						
					 | 
					
						
						
							
							whitespace logo - i know i should stop commiting changes like this - waiting for admin ui to do this
						
						
						
						
						
						
					 | 
					
						2010-03-21 21:30:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sandb
							
						 
					 | 
					
						
						
						
						
							
						
						
							eda14cdca4
							
						
					 | 
					
						
						
							
							start of php admin interface to update macs - pre-alfa state
						
						
						
						
						
						
					 | 
					
						2010-02-28 19:16:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sandb
							
						 
					 | 
					
						
						
						
						
							
						
						
							8db795b9b3
							
						
					 | 
					
						
						
							
							byte night mods
						
						
						
						
						
						
					 | 
					
						2010-02-04 23:27:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sandb
							
						 
					 | 
					
						
						
						
						
							
						
						
							b77e986a16
							
						
					 | 
					
						
						
							
							downloading of script, script updated, support for distrib upload finalized (i think)
						
						
						
						
						
						
					 | 
					
						2009-12-29 22:53:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pieter Iserbyt
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6853b8c8f
							
						
					 | 
					
						
						
							
							pamela, adapted for 26c3. mouse control added, resize problems solved, alpha + color depth filtering, synchronisation with new and old entries
						
						
						
						
						
						
					 | 
					
						2009-12-28 19:46:59 +01:00 | 
					
					
						
						
							
							
							
						
					 |