Show
Ignore:
Timestamp:
09/07/09 23:23:48 (3 years ago)
Author:
Pierre-Alexandre Meyer <pierre@…>
Children:
57c8555003f53800da1bb93a765d80678ae230ae
Parents:
e9069caefc1460ec7f4d058796005474c125fc61, 39758675d88eb2b0d5c64239aa5d47df61e4d106
git-committer:
Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-09-07T16:23:48Z-0700
Message:

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@…>

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • com32/hdt/hdt-cli.c

    r2ba444 r47ac91  
    3333#include "hdt-cli.h" 
    3434#include "hdt-common.h" 
    35 #include "lib-ansi.h" 
    3635 
    3736struct cli_mode_descr *list_modes[] = {