Changeset c37c24c in mainline

Timestamp:

2024-04-07T09:52:47Z (4 weeks ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

e55d2c1

Parents:

6c1e7c0 (diff), 34aad53d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'topic/packet-capture' into topic/packet-capture-choose-nic

Files:

• README.md (modified) (view diffs)
• abi/include/abi/ipc/interfaces.h (modified) (view diffs)
• defaults/ia64/Makefile.config (modified) (view diffs)
• meson/part/initrd_manifest/meson.build (modified) (view diffs)
• tools/export.sh (modified) (view diffs)
• tools/mkarray.py (modified) (view diffs)
• tools/mkarray_for_meson.sh (modified) (view diffs)
• tools/xcw/bin/helenos-pkg-config (modified) (view diffs)
• uspace/app/aboutos/aboutos.c (added)
• uspace/app/aboutos/aboutos.h (moved) (moved from uspace/app/launcher/launcher.h ) (view diffs)
• uspace/app/aboutos/doc/doxygroups.h (added)
• uspace/app/aboutos/gfx/helenos.tga (moved) (moved from uspace/app/launcher/gfx/helenos.tga ) (view diffs)
• uspace/app/aboutos/meson.build (moved) (moved from uspace/app/launcher/meson.build ) (view diffs)
• uspace/app/barber/barber.c (modified) (view diffs)
• uspace/app/barber/gfx-tiny/frame01t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame02t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame03t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame04t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame05t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame06t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame07t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame08t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame09t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame10t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame11t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame12t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame13t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame14t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame15t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame16t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame17t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame18t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame19t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame20t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame21t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame22t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame23t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame24t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame25t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame26t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame27t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame28t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame29t.tga.gz (added)
• uspace/app/barber/gfx-tiny/frame30t.tga.gz (added)
• uspace/app/barber/meson.build (modified) (view diffs)
• uspace/app/fontedit/fontedit.c (modified) (view diffs)
• uspace/app/gfxdemo/gfxdemo.c (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/launcher/doc/doxygroups.h (deleted)
• uspace/app/launcher/launcher.c (deleted)
• uspace/app/meson.build (modified) (view diffs)
• uspace/app/nav/test/panel.c (modified) (view diffs)
• uspace/app/taskbar-cfg/smeedit.c (modified) (view diffs)
• uspace/app/taskbar-cfg/startmenu.c (modified) (view diffs)
• uspace/app/taskbar/meson.build (modified) (view diffs)
• uspace/app/taskbar/taskbar.c (modified) (view diffs)
• uspace/app/taskbar/taskbar.sif (modified) (view diffs)
• uspace/app/taskbar/tbsmenu.c (modified) (view diffs)
• uspace/app/taskbar/tbsmenu.h (modified) (view diffs)
• uspace/app/taskbar/test/tbsmenu.c (modified) (view diffs)
• uspace/app/taskbar/types/taskbar.h (modified) (view diffs)
• uspace/app/taskbar/types/tbsmenu.h (modified) (view diffs)
• uspace/app/terminal/terminal.c (modified) (view diffs)
• uspace/app/viewer/viewer.c (modified) (view diffs)
• uspace/lib/congfx/src/console.c (modified) (view diffs)
• uspace/lib/gfx/src/color.c (modified) (view diffs)
• uspace/lib/meson.build (modified) (view diffs)
• uspace/lib/tbarcfg/include/ipc/tbarcfg.h (added)
• uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h (modified) (view diffs)
• uspace/lib/tbarcfg/include/types/tbarcfg/tbarcfg.h (modified) (view diffs)
• uspace/lib/tbarcfg/private/tbarcfg.h (modified) (view diffs)
• uspace/lib/tbarcfg/src/tbarcfg.c (modified) (view diffs)
• uspace/lib/tbarcfg/test/tbarcfg.c (modified) (view diffs)
• uspace/lib/ui/include/ui/menu.h (modified) (view diffs)
• uspace/lib/ui/include/ui/popup.h (modified) (view diffs)
• uspace/lib/ui/include/ui/wdecor.h (modified) (view diffs)
• uspace/lib/ui/private/menu.h (modified) (view diffs)
• uspace/lib/ui/private/popup.h (modified) (view diffs)
• uspace/lib/ui/src/menu.c (modified) (view diffs)
• uspace/lib/ui/src/menuentry.c (modified) (view diffs)
• uspace/lib/ui/src/popup.c (modified) (view diffs)
• uspace/lib/ui/src/wdecor.c (modified) (view diffs)
• uspace/lib/ui/test/wdecor.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidparser.c (modified) (view diffs)
• uspace/srv/hid/output/port/ega.c (modified) (view diffs)
• uspace/srv/locsrv/locsrv.c (modified) (view diffs)
• version (modified) (view diffs)