xen-changelog

[Top] [All Lists]

[Xen-changelog] Resolve merge failure.

from [BitKeeper Bot]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Resolve merge failure.
From:	BitKeeper Bot <riel@xxxxxxxxxxx>
Date:	Thu, 28 Apr 2005 13:33:33 +0000
Delivery-date:	Fri, 13 May 2005 20:04:48 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

ChangeSet 1.1391, 2005/04/28 14:33:33+01:00, mjw@xxxxxxxxxxxxxxxxxxx

        Resolve merge failure.
        Signed-off-by: Mike Wray <mike.wray@xxxxxx>



 Makefile |    2 ++
 1 files changed, 2 insertions(+)


diff -Nru a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile    2005-05-13 16:05:23 -04:00
+++ b/tools/Makefile    2005-05-13 16:05:23 -04:00
@@ -10,7 +10,9 @@
 SUBDIRS += python
 SUBDIRS += xfrd
 SUBDIRS += xcs
+ifndef XEN_NO_IOEMU
 SUBDIRS += ioemu
+endif
 SUBDIRS += pygrub
 
 .PHONY: all install clean check check_clean

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Resolve merge failure., BitKeeper Bot <=

Previous by Date:	[Xen-changelog] Move blkif utility functions into xen.util., BitKeeper Bot
Next by Date:	[Xen-changelog] Apply Nguyen's patch:, BitKeeper Bot
Previous by Thread:	[Xen-changelog] Move blkif utility functions into xen.util., BitKeeper Bot
Next by Thread:	[Xen-changelog] Apply Nguyen's patch:, BitKeeper Bot
Indexes:	[Date] [Thread] [Top] [All Lists]