3 Commits

Author	SHA1	Message	Date
espes	0ca0cc251d	build fixes	2015-06-21 01:41:32 +10:00
espes	3a7b7d4978	build fixes for merge	2013-08-20 16:46:49 +10:00
espes	ff3f9be0e2	Merge tag 'v1.6.0' into xbox ... Conflicts: block/Makefile.objs configure hw/Makefile.objs hw/audio/ac97.c hw/i386/Makefile.objs hw/ide/core.c ui/console.c	2013-08-19 22:46:10 +10:00