sthen 331eb83819 remove bogus conflict markers and bump, problem noticed by henning@		2010-10-28 22:34:47 +00:00
..
files	update qemu to 0.12.5; testing/feedback from Daniel Dickman, Dawe, lum@,	2010-08-26 13:44:29 +00:00
patches	Add debug flavor.	2010-06-17 09:57:55 +00:00
pkg	remove bogus conflict markers and bump, problem noticed by henning@	2010-10-28 22:34:47 +00:00
distinfo	update qemu to 0.12.5; testing/feedback from Daniel Dickman, Dawe, lum@,	2010-08-26 13:44:29 +00:00
Makefile	remove bogus conflict markers and bump, problem noticed by henning@	2010-10-28 22:34:47 +00:00