diff options
| author | Michal Soltys <soltys@ziu.info> | 2011-05-04 15:46:29 +0200 |
|---|---|---|
| committer | Michal Soltys <soltys@ziu.info> | 2011-05-04 15:46:29 +0200 |
| commit | e4a46d8e86b3a14decc010d5cbd371922bdbb94b (patch) | |
| tree | d58aabf4be68f2d83fad4252840cfb2888252f5b /Makefile | |
| parent | 22411fad71c8949dbbe5880ae8a65043ca858872 (diff) | |
| parent | cf3ba289e440cc9e764243a02b8a474ebde70da7 (diff) | |
| download | syslinux-e4a46d8e86b3a14decc010d5cbd371922bdbb94b.tar.gz | |
Merge branch 'master' into chaindev
Conflicts:
com32/Makefile
com32/modules/chain.c
Note: add ReactOS' stuff introduced in old chain.c
Signed-off-by: Michal Soltys <soltys@ziu.info>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -15,7 +15,8 @@ # Main Makefile for SYSLINUX # topdir = . -include $(topdir)/MCONFIG +MAKEDIR = $(topdir)/mk +include $(MAKEDIR)/syslinux.mk -include $(topdir)/version.mk # |