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
..
Haiku	Merge branch 'scheduler'	2014-01-17 04:06:15 +01:00
HaikuBootstrap	Merge branch 'scheduler'	2014-01-17 04:06:15 +01:00
HaikuCrossDevel
HaikuDevel	GL: Remove OpenGL kit, x86 Mesa	2013-12-22 23:36:02 -06:00
HaikuDevelSecondary	GL: Remove OpenGL kit, x86 Mesa	2013-12-22 23:36:02 -06:00
HaikuLoader
HaikuSecondary	GL: Remove OpenGL kit, x86 Mesa	2013-12-22 23:36:02 -06:00
HaikuSecondaryBootstrap
HaikuUserguide
HaikuWelcome
MakefileEngine
WebPositive