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
..
apps	…
bin	…
develop	ARM: add a TODO for KDL disasm module	2013-10-19 15:55:18 +02:00
freetype2	…
icon_guidelines	…
user	Merge branch 'scheduler'	2014-01-17 04:06:15 +01:00
userguide	Update userguide from i18n.haiku-os.org	2013-12-15 13:04:28 +01:00
welcome	Update userguide translations	2013-02-17 21:56:39 +01:00