projects / profile / ivi / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55de9cb 3b80c26)
Merge branch 'master' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 11 Apr 2009 17:46:38 +0000 (10:46 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 11 Apr 2009 17:46:38 +0000 (10:46 -0700)
Conflicts:

com32/hdt/Makefile

1  2 
com32/hdt/hdt-common.c patch | diff1 | diff2 | blob | history
com32/modules/Makefile patch | diff1 | diff2 | blob | history

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