projects / profile / ivi / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0a0e56 7bd5d73)
Merge branch 'disklib' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 26 Apr 2009 21:35:56 +0000 (14:35 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sun, 26 Apr 2009 21:35:56 +0000 (14:35 -0700)
Conflicts:

com32/hdt/hdt-common.c

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
1  2 
com32/hdt/hdt-cli-hdt.c patch | diff1 | diff2 | blob | history
com32/hdt/hdt-common.c patch | diff1 | diff2 | blob | history
com32/hdt/hdt-common.h patch | diff1 | diff2 | blob | history

diff --cc com32/hdt/hdt-cli-hdt.c
Simple merge
diff --cc com32/hdt/hdt-common.c
Simple merge
diff --cc com32/hdt/hdt-common.h
Simple merge
Domain: System / Uncategorized;