projects / platform / upstream / syslinux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 844e965 d7d20a7)
Merge remote-tracking branch 'zytor/master' into elflink
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:46:34 +0000 (09:46 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:46:34 +0000 (09:46 +0100)
commit10d05cbef13345ef3730234c1da7b0a34cdca9b6
treed5a582d888db9c2dc360c9005c133b713f248e55tree | snapshot
parent844e965443e08133a7a366a496d8cc52ef93ca48commit | diff
parentd7d20a78c72237f85d8508c93aa411529d0ac17acommit | diff
Merge remote-tracking branch 'zytor/master' into elflink

We need the recent Makefile filename changes to be merged into the
elflink branch because it will make things simpler when converting all
modules to ELF format.

Conflicts:
com32/Makefile
com32/modules/Makefile
version
12 files changed:
com32/Makefile diff1 | diff2 | blob | history
com32/lib/Makefile diff1 | diff2 | blob | history
core/Makefile diff1 | diff2 | blob | history
core/diskfs.inc diff1 | diff2 | blob | history
core/diskstart.inc diff1 | diff2 | blob | history
core/isolinux.asm diff1 | diff2 | blob | history
core/ui.inc diff1 | diff2 | blob | history
libinstaller/syslxmod.c diff1 | diff2 | blob | history
mk/com32.mk diff1 | diff2 | blob | history
mk/devel.mk diff1 | diff2 | blob | history
mk/lib.mk diff1 | diff2 | blob | history
mk/syslinux.mk diff1 | diff2 | blob | history
Domain: System / Base;