d0f2d8282f
Conflicts: build/jam/packages/Haiku headers/os/kernel/OS.h headers/os/opengl/GLRenderer.h headers/private/shared/cpu_type.h src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.h src/bin/sysinfo.cpp src/bin/top.c src/system/kernel/arch/x86/arch_system_info.cpp src/system/kernel/port.cpp |
||
---|---|---|
.. | ||
hpkg | ||
manager | ||
ActivateRepositoryCacheJob.h | ||
ActivateRepositoryConfigJob.h | ||
ActivationTransaction.h | ||
ChecksumAccessors.h | ||
DaemonClient.h | ||
DaemonDefs.h | ||
FetchFileJob.h | ||
HashableString.h | ||
JobQueue.h | ||
packagefs.h | ||
PackagesDirectoryDefs.h | ||
RemoveRepositoryJob.h | ||
TempfileManager.h | ||
ValidateChecksumJob.h |