From 0045481bad7b44fb0f5aff1dc051d5362d4795be Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 21 May 2025 19:49:38 +0100 Subject: [PATCH] fs/kfar: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. --- data/Tupfile.lua | 8 ++++---- programs/build_all.bat | 2 +- programs/fs/kfar/{trunk => }/Tupfile.lua | 2 +- programs/fs/kfar/{trunk => }/api.txt | 0 programs/fs/kfar/{trunk => }/build_en.bat | 0 programs/fs/kfar/{trunk => }/build_ru.bat | 0 programs/fs/kfar/{trunk => }/dialogs.inc | 0 programs/fs/kfar/{trunk => }/editor.inc | 0 programs/fs/kfar/{trunk => }/filetool.inc | 0 programs/fs/kfar/{trunk => }/font.inc | 0 programs/fs/kfar/{trunk => }/font10x20.bmp | Bin programs/fs/kfar/{trunk => }/font6x9.bmp | Bin programs/fs/kfar/{trunk => }/font7x12.bmp | Bin programs/fs/kfar/{trunk => }/font8x16.bmp | Bin programs/fs/kfar/{trunk => }/font8x9.bmp | Bin programs/fs/kfar/{trunk => }/kfar.asm | 10 ++++++++-- programs/fs/kfar/{trunk => }/kfar.ini | 0 programs/fs/kfar/{trunk => }/kfar.txt | 0 programs/fs/kfar/{trunk => }/kfar_arc/7z.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/7zaes.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/7zbranch.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/Tupfile.lua | 0 programs/fs/kfar/{trunk => }/kfar_arc/aes.inc | 0 .../kfar/{trunk => }/kfar_arc/archiver_deflate.txt | 0 programs/fs/kfar/{trunk => }/kfar_arc/crc.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/deflate.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/kfar_arc.asm | 0 programs/fs/kfar/{trunk => }/kfar_arc/kglobals.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/lzma.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/ppmd.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/sha256.inc | 0 programs/fs/kfar/{trunk => }/kfar_arc/zip.inc | 0 programs/fs/kfar/{trunk => }/kglobals.inc | 0 programs/fs/kfar/{trunk => }/search.inc | 0 programs/fs/kfar/{trunk => }/sort.inc | 0 programs/fs/kfar/{trunk => }/tools.inc | 0 programs/fs/kfar/{trunk => }/viewer.inc | 0 programs/fs/kfar/{trunk => }/zlib/adler32.asm | 0 programs/fs/kfar/{trunk => }/zlib/build.bat | 0 programs/fs/kfar/{trunk => }/zlib/crc32.asm | 0 programs/fs/kfar/{trunk => }/zlib/debug.inc | 0 programs/fs/kfar/{trunk => }/zlib/deflate.asm | 0 programs/fs/kfar/{trunk => }/zlib/deflate.inc | 0 programs/fs/kfar/{trunk => }/zlib/example1.asm | 0 programs/fs/kfar/{trunk => }/zlib/trees.asm | 0 programs/fs/kfar/{trunk => }/zlib/trees.inc | 0 programs/fs/kfar/{trunk => }/zlib/zconf.inc | 0 programs/fs/kfar/{trunk => }/zlib/zlib.asm | 0 programs/fs/kfar/{trunk => }/zlib/zlib.inc | 0 programs/fs/kfar/{trunk => }/zlib/zlib.txt | 0 programs/fs/kfar/{trunk => }/zlib/zutil.asm | 0 programs/fs/kfar/{trunk => }/zlib/zutil.inc | 0 52 files changed, 14 insertions(+), 8 deletions(-) rename programs/fs/kfar/{trunk => }/Tupfile.lua (79%) rename programs/fs/kfar/{trunk => }/api.txt (100%) rename programs/fs/kfar/{trunk => }/build_en.bat (100%) rename programs/fs/kfar/{trunk => }/build_ru.bat (100%) rename programs/fs/kfar/{trunk => }/dialogs.inc (100%) rename programs/fs/kfar/{trunk => }/editor.inc (100%) rename programs/fs/kfar/{trunk => }/filetool.inc (100%) rename programs/fs/kfar/{trunk => }/font.inc (100%) rename programs/fs/kfar/{trunk => }/font10x20.bmp (100%) rename programs/fs/kfar/{trunk => }/font6x9.bmp (100%) rename programs/fs/kfar/{trunk => }/font7x12.bmp (100%) rename programs/fs/kfar/{trunk => }/font8x16.bmp (100%) rename programs/fs/kfar/{trunk => }/font8x9.bmp (100%) rename programs/fs/kfar/{trunk => }/kfar.asm (99%) rename programs/fs/kfar/{trunk => }/kfar.ini (100%) rename programs/fs/kfar/{trunk => }/kfar.txt (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/7z.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/7zaes.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/7zbranch.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/Tupfile.lua (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/aes.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/archiver_deflate.txt (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/crc.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/deflate.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/kfar_arc.asm (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/kglobals.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/lzma.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/ppmd.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/sha256.inc (100%) rename programs/fs/kfar/{trunk => }/kfar_arc/zip.inc (100%) rename programs/fs/kfar/{trunk => }/kglobals.inc (100%) rename programs/fs/kfar/{trunk => }/search.inc (100%) rename programs/fs/kfar/{trunk => }/sort.inc (100%) rename programs/fs/kfar/{trunk => }/tools.inc (100%) rename programs/fs/kfar/{trunk => }/viewer.inc (100%) rename programs/fs/kfar/{trunk => }/zlib/adler32.asm (100%) rename programs/fs/kfar/{trunk => }/zlib/build.bat (100%) rename programs/fs/kfar/{trunk => }/zlib/crc32.asm (100%) rename programs/fs/kfar/{trunk => }/zlib/debug.inc (100%) rename programs/fs/kfar/{trunk => }/zlib/deflate.asm (100%) rename programs/fs/kfar/{trunk => }/zlib/deflate.inc (100%) rename programs/fs/kfar/{trunk => }/zlib/example1.asm (100%) rename programs/fs/kfar/{trunk => }/zlib/trees.asm (100%) rename programs/fs/kfar/{trunk => }/zlib/trees.inc (100%) rename programs/fs/kfar/{trunk => }/zlib/zconf.inc (100%) rename programs/fs/kfar/{trunk => }/zlib/zlib.asm (100%) rename programs/fs/kfar/{trunk => }/zlib/zlib.inc (100%) rename programs/fs/kfar/{trunk => }/zlib/zlib.txt (100%) rename programs/fs/kfar/{trunk => }/zlib/zutil.asm (100%) rename programs/fs/kfar/{trunk => }/zlib/zutil.inc (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 8d4f56698..aaee66781 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -154,7 +154,7 @@ extra_files = { {"kolibrios/3D/info3ds/INFO3DS.INI", SRC_PROGS .. "/develop/info3ds/info3ds.ini"}, {"kolibrios/3D/info3ds/OBJECTS.PNG", SRC_PROGS .. "/develop/info3ds/objects.png"}, {"kolibrios/3D/info3ds/TOOLBAR.PNG", SRC_PROGS .. "/develop/info3ds/toolbar.png"}, - {"kolibrios/3D/info3ds/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/trunk/font8x9.bmp"}, + {"kolibrios/3D/info3ds/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/font8x9.bmp"}, {"kolibrios/3D/blocks/blocks.kex", "../programs/bcc32/games/blocks/bin/blocks.kex"}, {"kolibrios/3D/blocks/models/", "../programs/bcc32/games/blocks/models/*"}, {"kolibrios/3D/md2view/", "common/3d/md2view/*"}, @@ -164,7 +164,7 @@ extra_files = { {"kolibrios/3D/voxel_editor/HOUSE2.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/house2.vox"}, {"kolibrios/3D/voxel_editor/SQUIRREL.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/squirrel.vox"}, {"kolibrios/3D/voxel_utilites/VOX_MOVER.INI" , SRC_PROGS .. "/media/voxel_editor/utilites/vox_mover.ini"}, - {"kolibrios/3D/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/trunk/font8x9.bmp"}, + {"kolibrios/3D/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/font8x9.bmp"}, {"kolibrios/3D/TOOLB_1.PNG", SRC_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png"}, {"kolibrios/3D/TEST_GLU1", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu1"}, {"kolibrios/3D/TEST_GLU2", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu2"}, @@ -486,7 +486,7 @@ tup.append_table(img_files, { {"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"}, {"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/trunk/cslide"}, {"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/trunk/thread"}, - {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"}, + {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/kfar"}, {"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"}, {"LOD", VAR_PROGS .. "/fs/lod/lod"}, {"GAMES/15", VAR_PROGS .. "/games/15/15"}, @@ -505,7 +505,7 @@ tup.append_table(img_files, { {"GAMES/TANKS", VAR_PROGS .. "/games/tanks/tanks"}, {"GAMES/TETRIS", VAR_PROGS .. "/games/tetris/tetris"}, {"GAMES/C4", VAR_PROGS .. "/games/c4/c4"}, - {"LIB/ARCHIVER.OBJ", VAR_PROGS .. "/fs/kfar/trunk/kfar_arc/kfar_arc.obj"}, + {"LIB/ARCHIVER.OBJ", VAR_PROGS .. "/fs/kfar/kfar_arc/kfar_arc.obj"}, {"LIB/BOX_LIB.OBJ", VAR_PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"}, {"LIB/BUF2D.OBJ", VAR_PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"}, {"LIB/CONSOLE.OBJ", VAR_PROGS .. "/develop/libraries/console_coff/console.obj"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 65338383e..5621f5aa0 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -113,7 +113,7 @@ echo Building fs echo * fasm fs\copy2\trunk\copy2.asm %BIN%\copy2 fasm fs\copyr\copyr.asm %BIN%\copyr -fasm fs\kfar\trunk\kfar.asm %BIN%\kfar +fasm fs\kfar\kfar.asm %BIN%\kfar rem fasm fs\mfar\trunk\mfar.asm %BIN%\mfar fasm fs\sysxtree\trunk\sysxtree.asm %BIN%\sysxtree diff --git a/programs/fs/kfar/trunk/Tupfile.lua b/programs/fs/kfar/Tupfile.lua similarity index 79% rename from programs/fs/kfar/trunk/Tupfile.lua rename to programs/fs/kfar/Tupfile.lua index 7c3d9c33c..031939bd0 100644 --- a/programs/fs/kfar/trunk/Tupfile.lua +++ b/programs/fs/kfar/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/fs/kfar/trunk/api.txt b/programs/fs/kfar/api.txt similarity index 100% rename from programs/fs/kfar/trunk/api.txt rename to programs/fs/kfar/api.txt diff --git a/programs/fs/kfar/trunk/build_en.bat b/programs/fs/kfar/build_en.bat similarity index 100% rename from programs/fs/kfar/trunk/build_en.bat rename to programs/fs/kfar/build_en.bat diff --git a/programs/fs/kfar/trunk/build_ru.bat b/programs/fs/kfar/build_ru.bat similarity index 100% rename from programs/fs/kfar/trunk/build_ru.bat rename to programs/fs/kfar/build_ru.bat diff --git a/programs/fs/kfar/trunk/dialogs.inc b/programs/fs/kfar/dialogs.inc similarity index 100% rename from programs/fs/kfar/trunk/dialogs.inc rename to programs/fs/kfar/dialogs.inc diff --git a/programs/fs/kfar/trunk/editor.inc b/programs/fs/kfar/editor.inc similarity index 100% rename from programs/fs/kfar/trunk/editor.inc rename to programs/fs/kfar/editor.inc diff --git a/programs/fs/kfar/trunk/filetool.inc b/programs/fs/kfar/filetool.inc similarity index 100% rename from programs/fs/kfar/trunk/filetool.inc rename to programs/fs/kfar/filetool.inc diff --git a/programs/fs/kfar/trunk/font.inc b/programs/fs/kfar/font.inc similarity index 100% rename from programs/fs/kfar/trunk/font.inc rename to programs/fs/kfar/font.inc diff --git a/programs/fs/kfar/trunk/font10x20.bmp b/programs/fs/kfar/font10x20.bmp similarity index 100% rename from programs/fs/kfar/trunk/font10x20.bmp rename to programs/fs/kfar/font10x20.bmp diff --git a/programs/fs/kfar/trunk/font6x9.bmp b/programs/fs/kfar/font6x9.bmp similarity index 100% rename from programs/fs/kfar/trunk/font6x9.bmp rename to programs/fs/kfar/font6x9.bmp diff --git a/programs/fs/kfar/trunk/font7x12.bmp b/programs/fs/kfar/font7x12.bmp similarity index 100% rename from programs/fs/kfar/trunk/font7x12.bmp rename to programs/fs/kfar/font7x12.bmp diff --git a/programs/fs/kfar/trunk/font8x16.bmp b/programs/fs/kfar/font8x16.bmp similarity index 100% rename from programs/fs/kfar/trunk/font8x16.bmp rename to programs/fs/kfar/font8x16.bmp diff --git a/programs/fs/kfar/trunk/font8x9.bmp b/programs/fs/kfar/font8x9.bmp similarity index 100% rename from programs/fs/kfar/trunk/font8x9.bmp rename to programs/fs/kfar/font8x9.bmp diff --git a/programs/fs/kfar/trunk/kfar.asm b/programs/fs/kfar/kfar.asm similarity index 99% rename from programs/fs/kfar/trunk/kfar.asm rename to programs/fs/kfar/kfar.asm index 9caf0db73..2571c16d5 100644 --- a/programs/fs/kfar/trunk/kfar.asm +++ b/programs/fs/kfar/kfar.asm @@ -1,3 +1,9 @@ +; SPDX-License-Identifier: NOASSERTION +; + +; Text encoded with Code Page 866 - Cyrillic + + use32 db 'MENUET01' dd 1 @@ -15,8 +21,8 @@ max_width = 255 min_height = 8 max_height = 255 -include '../../../KOSfuncs.inc' -include '../../../macros.inc' +include '../../KOSfuncs.inc' +include '../../macros.inc' include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US. include 'font.inc' include 'sort.inc' diff --git a/programs/fs/kfar/trunk/kfar.ini b/programs/fs/kfar/kfar.ini similarity index 100% rename from programs/fs/kfar/trunk/kfar.ini rename to programs/fs/kfar/kfar.ini diff --git a/programs/fs/kfar/trunk/kfar.txt b/programs/fs/kfar/kfar.txt similarity index 100% rename from programs/fs/kfar/trunk/kfar.txt rename to programs/fs/kfar/kfar.txt diff --git a/programs/fs/kfar/trunk/kfar_arc/7z.inc b/programs/fs/kfar/kfar_arc/7z.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/7z.inc rename to programs/fs/kfar/kfar_arc/7z.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/7zaes.inc b/programs/fs/kfar/kfar_arc/7zaes.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/7zaes.inc rename to programs/fs/kfar/kfar_arc/7zaes.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/7zbranch.inc b/programs/fs/kfar/kfar_arc/7zbranch.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/7zbranch.inc rename to programs/fs/kfar/kfar_arc/7zbranch.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua b/programs/fs/kfar/kfar_arc/Tupfile.lua similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/Tupfile.lua rename to programs/fs/kfar/kfar_arc/Tupfile.lua diff --git a/programs/fs/kfar/trunk/kfar_arc/aes.inc b/programs/fs/kfar/kfar_arc/aes.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/aes.inc rename to programs/fs/kfar/kfar_arc/aes.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/archiver_deflate.txt b/programs/fs/kfar/kfar_arc/archiver_deflate.txt similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/archiver_deflate.txt rename to programs/fs/kfar/kfar_arc/archiver_deflate.txt diff --git a/programs/fs/kfar/trunk/kfar_arc/crc.inc b/programs/fs/kfar/kfar_arc/crc.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/crc.inc rename to programs/fs/kfar/kfar_arc/crc.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/deflate.inc b/programs/fs/kfar/kfar_arc/deflate.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/deflate.inc rename to programs/fs/kfar/kfar_arc/deflate.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/kfar_arc.asm b/programs/fs/kfar/kfar_arc/kfar_arc.asm similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/kfar_arc.asm rename to programs/fs/kfar/kfar_arc/kfar_arc.asm diff --git a/programs/fs/kfar/trunk/kfar_arc/kglobals.inc b/programs/fs/kfar/kfar_arc/kglobals.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/kglobals.inc rename to programs/fs/kfar/kfar_arc/kglobals.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/lzma.inc b/programs/fs/kfar/kfar_arc/lzma.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/lzma.inc rename to programs/fs/kfar/kfar_arc/lzma.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/ppmd.inc b/programs/fs/kfar/kfar_arc/ppmd.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/ppmd.inc rename to programs/fs/kfar/kfar_arc/ppmd.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/sha256.inc b/programs/fs/kfar/kfar_arc/sha256.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/sha256.inc rename to programs/fs/kfar/kfar_arc/sha256.inc diff --git a/programs/fs/kfar/trunk/kfar_arc/zip.inc b/programs/fs/kfar/kfar_arc/zip.inc similarity index 100% rename from programs/fs/kfar/trunk/kfar_arc/zip.inc rename to programs/fs/kfar/kfar_arc/zip.inc diff --git a/programs/fs/kfar/trunk/kglobals.inc b/programs/fs/kfar/kglobals.inc similarity index 100% rename from programs/fs/kfar/trunk/kglobals.inc rename to programs/fs/kfar/kglobals.inc diff --git a/programs/fs/kfar/trunk/search.inc b/programs/fs/kfar/search.inc similarity index 100% rename from programs/fs/kfar/trunk/search.inc rename to programs/fs/kfar/search.inc diff --git a/programs/fs/kfar/trunk/sort.inc b/programs/fs/kfar/sort.inc similarity index 100% rename from programs/fs/kfar/trunk/sort.inc rename to programs/fs/kfar/sort.inc diff --git a/programs/fs/kfar/trunk/tools.inc b/programs/fs/kfar/tools.inc similarity index 100% rename from programs/fs/kfar/trunk/tools.inc rename to programs/fs/kfar/tools.inc diff --git a/programs/fs/kfar/trunk/viewer.inc b/programs/fs/kfar/viewer.inc similarity index 100% rename from programs/fs/kfar/trunk/viewer.inc rename to programs/fs/kfar/viewer.inc diff --git a/programs/fs/kfar/trunk/zlib/adler32.asm b/programs/fs/kfar/zlib/adler32.asm similarity index 100% rename from programs/fs/kfar/trunk/zlib/adler32.asm rename to programs/fs/kfar/zlib/adler32.asm diff --git a/programs/fs/kfar/trunk/zlib/build.bat b/programs/fs/kfar/zlib/build.bat similarity index 100% rename from programs/fs/kfar/trunk/zlib/build.bat rename to programs/fs/kfar/zlib/build.bat diff --git a/programs/fs/kfar/trunk/zlib/crc32.asm b/programs/fs/kfar/zlib/crc32.asm similarity index 100% rename from programs/fs/kfar/trunk/zlib/crc32.asm rename to programs/fs/kfar/zlib/crc32.asm diff --git a/programs/fs/kfar/trunk/zlib/debug.inc b/programs/fs/kfar/zlib/debug.inc similarity index 100% rename from programs/fs/kfar/trunk/zlib/debug.inc rename to programs/fs/kfar/zlib/debug.inc diff --git a/programs/fs/kfar/trunk/zlib/deflate.asm b/programs/fs/kfar/zlib/deflate.asm similarity index 100% rename from programs/fs/kfar/trunk/zlib/deflate.asm rename to programs/fs/kfar/zlib/deflate.asm diff --git a/programs/fs/kfar/trunk/zlib/deflate.inc b/programs/fs/kfar/zlib/deflate.inc similarity index 100% rename from programs/fs/kfar/trunk/zlib/deflate.inc rename to programs/fs/kfar/zlib/deflate.inc diff --git a/programs/fs/kfar/trunk/zlib/example1.asm b/programs/fs/kfar/zlib/example1.asm similarity index 100% rename from programs/fs/kfar/trunk/zlib/example1.asm rename to programs/fs/kfar/zlib/example1.asm diff --git a/programs/fs/kfar/trunk/zlib/trees.asm b/programs/fs/kfar/zlib/trees.asm similarity index 100% rename from programs/fs/kfar/trunk/zlib/trees.asm rename to programs/fs/kfar/zlib/trees.asm diff --git a/programs/fs/kfar/trunk/zlib/trees.inc b/programs/fs/kfar/zlib/trees.inc similarity index 100% rename from programs/fs/kfar/trunk/zlib/trees.inc rename to programs/fs/kfar/zlib/trees.inc diff --git a/programs/fs/kfar/trunk/zlib/zconf.inc b/programs/fs/kfar/zlib/zconf.inc similarity index 100% rename from programs/fs/kfar/trunk/zlib/zconf.inc rename to programs/fs/kfar/zlib/zconf.inc diff --git a/programs/fs/kfar/trunk/zlib/zlib.asm b/programs/fs/kfar/zlib/zlib.asm similarity index 100% rename from programs/fs/kfar/trunk/zlib/zlib.asm rename to programs/fs/kfar/zlib/zlib.asm diff --git a/programs/fs/kfar/trunk/zlib/zlib.inc b/programs/fs/kfar/zlib/zlib.inc similarity index 100% rename from programs/fs/kfar/trunk/zlib/zlib.inc rename to programs/fs/kfar/zlib/zlib.inc diff --git a/programs/fs/kfar/trunk/zlib/zlib.txt b/programs/fs/kfar/zlib/zlib.txt similarity index 100% rename from programs/fs/kfar/trunk/zlib/zlib.txt rename to programs/fs/kfar/zlib/zlib.txt diff --git a/programs/fs/kfar/trunk/zlib/zutil.asm b/programs/fs/kfar/zlib/zutil.asm similarity index 100% rename from programs/fs/kfar/trunk/zlib/zutil.asm rename to programs/fs/kfar/zlib/zutil.asm diff --git a/programs/fs/kfar/trunk/zlib/zutil.inc b/programs/fs/kfar/zlib/zutil.inc similarity index 100% rename from programs/fs/kfar/trunk/zlib/zutil.inc rename to programs/fs/kfar/zlib/zutil.inc