Merge commit 'mouraf/for-erwan' into disklib
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 19 Apr 2009 15:31:57 +0000 (08:31 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 19 Apr 2009 15:31:57 +0000 (08:31 -0700)
commit29feadbdcfb667e0faca8a6391fe19f3f9a6b327
tree53d052e48df73a711a0127367f4ce6cf759c411d
parent3ff657d37c92d9fec9e9842216dfee3f5c21a6c3
parent13c60849867ecc575b8f28dc259705b772611402
Merge commit 'mouraf/for-erwan' into disklib

Conflicts:
com32/hdt/hdt-cli.c
com32/hdt/hdt-cli.h
com32/hdt/hdt-cli.c
com32/hdt/hdt-cli.h
com32/hdt/hdt-common.c
com32/hdt/hdt-common.h
com32/hdt/hdt-menu.c
com32/hdt/hdt-menu.h