Merge branch 'cmenu-video' into hdt-next
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Mon, 7 Sep 2009 23:23:48 +0000 (16:23 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Mon, 7 Sep 2009 23:23:48 +0000 (16:23 -0700)
commit47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19
treecad3d89e5ffbc713877091eee96493a9471f848c
parente9069caefc1460ec7f4d058796005474c125fc61
parent39758675d88eb2b0d5c64239aa5d47df61e4d106
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>
com32/hdt/hdt-cli.c
com32/hdt/hdt-common.c
com32/hdt/hdt-common.h
com32/hdt/hdt-menu.c
com32/hdt/hdt-menu.h