Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9130636c88 
							
						 
					 
					
						
						
							
							Merge branch 'debian'  
						
						... 
						
						
						
						Conflicts:
	misc/qubes-r2.list.in
	misc/qubes-trigger-sync-appmenus.sh
	network/30-qubes-external-ip
	network/qubes-firewall
	vm-systemd/network-proxy-setup.sh
	vm-systemd/prepare-dvm.sh
	vm-systemd/qubes-sysinit.sh 
						
					 
					
						2015-01-30 00:30:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							db35abadc8 
							
						 
					 
					
						
						
							
							Use Qubes DB instead of Xenstore  
						
						
						
					 
					
						2014-11-19 15:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							44230f7f35 
							
						 
					 
					
						
						
							
							debian: Remove absolute path to xenstore-*  
						
						
						
					 
					
						2014-11-07 09:59:41 -05:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							30ca124784 
							
						 
					 
					
						
						
							
							The Underscores Revolution: xenstore paths  
						
						
						
					 
					
						2013-03-14 04:29:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ecc812f350 
							
						 
					 
					
						
						
							
							The Underscores Revolution: filenames  
						
						... 
						
						
						
						Get rid of underscores in filenames, use dashes instead.
This is first part of cleanup in filenames.
"qubes_rpc" still untouched - will be in separate commit. 
						
					 
					
						2013-03-14 01:07:49 +01:00