From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Mon, 7 Sep 2009 23:23:48 +0000 (-0700)
Subject: Merge branch 'cmenu-video' into hdt-next
X-Git-Tag: syslinux-3.84-pre1~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19;p=profile%2Fivi%2Fsyslinux.git

Merge branch 'cmenu-video' into hdt-next

Conflicts:
	com32/hdt/hdt-cli-disk.c
	com32/hdt/hdt-common.c

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---

47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19
diff --cc com32/hdt/hdt-common.c
index 11887c3,8d9cd70..28330a4
--- a/com32/hdt/hdt-common.c
+++ b/com32/hdt/hdt-common.c
@@@ -33,9 -33,7 +33,8 @@@
  #include "syslinux/config.h"
  #include "../lib/sys/vesa/vesa.h"
  #include "hdt-common.h"
- #include "lib-ansi.h"
  #include <disk/util.h>
 +#include <disk/mbrs.h>
  
  /* ISOlinux requires a 8.3 format */
  void convert_isolinux_filename(char *filename, struct s_hardware *hardware) {