Pawel Dziepak d0f2d8282f Merge branch 'scheduler' ... 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		2014-01-17 04:06:15 +01:00
..
config_build	…
gcc-2.95.3	…
host	…
os	runtime_loader: Detect and trigger on PE binaries	2014-01-07 19:38:07 -06:00
private	…
BeOSBuildCompatibility.h	…
HaikuBuildCompatibility.h	…