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-common.h

    re9069c r47ac91  
    4848#include "../lib/sys/vesa/vesa.h" 
    4949#include <vpd/vpd.h> 
     50#include <libansi.h> 
    5051 
    5152/* Declare a variable or data structure as unused. */ 
    … …  
    162163const char *find_argument(const char **argv, const char *argument); 
    163164char *remove_spaces(char *p); 
     165char *remove_trailing_lf(char *p); 
    164166char *skip_spaces(char *p); 
    165167char *del_multi_spaces(char *p);