Viewing all changes in revision 2281.
- Committer: Vojtech Horky
- Date: 2017-06-14 06:22:31 UTC
- mfrom: (2103.1.569 HelenOS.mainline)
- Revision ID: vojtechhorky@users.sourceforge.net-20170614062231-q4ui9pyxp0gs2hrl
Merge mainline changes
- files added:
- boot/Makefile.initrd
- uspace/lib/ext4/include
- uspace/lib/ext4/include/ext4
- uspace/lib/ext4/src
- files removed:
- tools/pack.py
- files renamed:
- boot/generic/include/typedefs.h => boot/generic/include/stddef.h
- kernel/generic/include/sort.h => kernel/generic/include/gsort.h
- kernel/generic/include/memstr.h => kernel/generic/include/mem.h
- kernel/generic/include/security/cap.h => kernel/generic/include/security/perm.h
- kernel/generic/src/lib/sort.c => kernel/generic/src/lib/gsort.c
- kernel/generic/src/lib/memstr.c => kernel/generic/src/lib/mem.c
- kernel/generic/src/security/cap.c => kernel/generic/src/security/perm.c
- uspace/dist/demo.txt => uspace/app/bdsh/demo.txt
- uspace/dist/demo.xm => uspace/app/modplay/demo.xm
- uspace/dist/logo.tga => uspace/app/viewer/logo.tga
- uspace/dist/demo.wav => uspace/app/wavplay/demo.wav
- uspace/lib/c/generic/sort.c => uspace/lib/c/generic/gsort.c
- uspace/lib/c/generic/cap.c => uspace/lib/c/generic/perm.c
- uspace/lib/c/include/sys/types.h => uspace/lib/c/include/fourcc.h
- uspace/lib/c/include/sort.h => uspace/lib/c/include/gsort.h
- uspace/lib/c/include/cap.h => uspace/lib/c/include/perm.h
- uspace/lib/ext4/libext4_balloc.h => uspace/lib/ext4/include/ext4/balloc.h
- uspace/lib/ext4/libext4_bitmap.h => uspace/lib/ext4/include/ext4/bitmap.h
- uspace/lib/ext4/libext4_block_group.h => uspace/lib/ext4/include/ext4/block_group.h
- uspace/lib/ext4/libext4_directory.h => uspace/lib/ext4/include/ext4/directory.h
- uspace/lib/ext4/libext4_directory_index.h => uspace/lib/ext4/include/ext4/directory_index.h
- uspace/lib/ext4/libext4_extent.h => uspace/lib/ext4/include/ext4/extent.h
- uspace/lib/ext4/libext4_filesystem.h => uspace/lib/ext4/include/ext4/filesystem.h
- uspace/lib/ext4/libext4_hash.h => uspace/lib/ext4/include/ext4/hash.h
- uspace/lib/ext4/libext4_ialloc.h => uspace/lib/ext4/include/ext4/ialloc.h
- uspace/lib/ext4/libext4_inode.h => uspace/lib/ext4/include/ext4/inode.h
- uspace/srv/fs/ext4fs/ext4fs.h => uspace/lib/ext4/include/ext4/ops.h
- uspace/lib/ext4/libext4_superblock.h => uspace/lib/ext4/include/ext4/superblock.h
- uspace/lib/ext4/libext4_types.h => uspace/lib/ext4/include/ext4/types.h
- uspace/lib/ext4/libext4_balloc.c => uspace/lib/ext4/src/balloc.c
- uspace/lib/ext4/libext4_bitmap.c => uspace/lib/ext4/src/bitmap.c
- uspace/lib/ext4/libext4_block_group.c => uspace/lib/ext4/src/block_group.c
- uspace/lib/ext4/libext4_directory.c => uspace/lib/ext4/src/directory.c
- uspace/lib/ext4/libext4_directory_index.c => uspace/lib/ext4/src/directory_index.c
- uspace/lib/ext4/libext4_extent.c => uspace/lib/ext4/src/extent.c
- uspace/lib/ext4/libext4_filesystem.c => uspace/lib/ext4/src/filesystem.c
- uspace/lib/ext4/libext4_hash.c => uspace/lib/ext4/src/hash.c
- uspace/lib/ext4/libext4_ialloc.c => uspace/lib/ext4/src/ialloc.c
- uspace/lib/ext4/libext4_inode.c => uspace/lib/ext4/src/inode.c
- uspace/srv/fs/ext4fs/ext4fs_ops.c => uspace/lib/ext4/src/ops.c
- uspace/lib/ext4/libext4_superblock.c => uspace/lib/ext4/src/superblock.c
- files modified:
- Makefile
expand all
collapse all
added
removed
