From b78f7ad026034d5ccb5e3376f38a4a8d36830de0 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Fri, 15 Jun 2012 14:25:22 +0000 Subject: [PATCH] fix git-svn-id: svn://kolibrios.org@2785 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/rus/Makefile | 6 +++--- .../hd_load/9x2klbr/{Klbrico.res => klbrico.res} | Bin programs/hd_load/usb_boot/BOOT_F32.ASM | 4 ++-- programs/hd_load/usb_boot/{MBR => mbr} | Bin 4 files changed, 5 insertions(+), 5 deletions(-) rename programs/hd_load/9x2klbr/{Klbrico.res => klbrico.res} (100%) rename programs/hd_load/usb_boot/{MBR => mbr} (100%) diff --git a/data/rus/Makefile b/data/rus/Makefile index 7cc0eb1d5b..4112dac4b7 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -201,8 +201,8 @@ FASM_NOKPACK_PROGRAMS:=\ distr_data/9x2klbr.exe:-:$(PROGS)/hd_load/9x2klbr/9x2klbr.asm \ distr_data/MeOSload.com:-:$(PROGS)/hd_load/meosload/MeOSload.asm \ distr_data/mtldr:-:$(PROGS)/hd_load/mtldr/mtldr.asm \ - mtldr_for_installer:-:$(PROGS)/hd_load/mtldr_installer/mtldr_code/mtldr.asm \ - distr_data/mtldr_install.exe:-:$(PROGS)/hd_load/mtldr_installer/mtldr_installer.asm \ + mtldr_for_installer:-:$(PROGS)/hd_load/mtldr_install/mtldr_code/mtldr.asm \ + distr_data/mtldr_install.exe:-:$(PROGS)/hd_load/mtldr_install/mtldr_install.asm \ distr_data/MeOSload_for_usb_boot_old.com:-:$(PROGS)/hd_load/usb_boot_old/MeOSload.asm \ distr_data/enable_for_usb_boot_old.exe:-:$(PROGS)/hd_load/usb_boot_old/enable.asm \ distr_data/BOOT_F32.BIN:-:$(PROGS)/hd_load/usb_boot/BOOT_F32.ASM \ @@ -325,7 +325,7 @@ MKISOFS_EXTRA:=\ HD_Load/9x2klbr/=../common/HD_load/9x2klbr/LDKLBR.VXD \ HD_Load/9x2klbr/=$(PROGS)/hd_load/9x2klbr/readme_dos.txt \ HD_Load/9x2klbr/=$(PROGS)/hd_load/9x2klbr/readme_win.txt \ - HD_Load/MeOSLoad/=distr_data/MeOSLoad.com \ + HD_Load/MeOSLoad/=distr_data/MeOSload.com \ HD_Load/MeOSLoad/=$(PROGS)/hd_load/meosload/AUTOEXEC.BAT \ HD_Load/MeOSLoad/=$(PROGS)/hd_load/meosload/CONFIG.SYS \ HD_Load/MeOSLoad/=$(PROGS)/hd_load/meosload/L_readme.txt \ diff --git a/programs/hd_load/9x2klbr/Klbrico.res b/programs/hd_load/9x2klbr/klbrico.res similarity index 100% rename from programs/hd_load/9x2klbr/Klbrico.res rename to programs/hd_load/9x2klbr/klbrico.res diff --git a/programs/hd_load/usb_boot/BOOT_F32.ASM b/programs/hd_load/usb_boot/BOOT_F32.ASM index 59f2ecde1a..275b3b9ca0 100644 --- a/programs/hd_load/usb_boot/BOOT_F32.ASM +++ b/programs/hd_load/usb_boot/BOOT_F32.ASM @@ -7,8 +7,8 @@ org 0x7C00 jmp @f nop -; times 57h db 0 - file 'bt2.dat':3,57h + times 57h db 0 +; file 'bt2.dat':3,57h @@: xor eax, eax mov ds, ax diff --git a/programs/hd_load/usb_boot/MBR b/programs/hd_load/usb_boot/mbr similarity index 100% rename from programs/hd_load/usb_boot/MBR rename to programs/hd_load/usb_boot/mbr