haiku/headers
Alex Smith 11c9f9a1d6 Merge branch 'master' into x86_64
Conflicts:
	build/jam/FloppyBootImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	headers/private/shared/cpu_type.h
	src/bin/ps.c
	src/bin/sysinfo.cpp
	src/kits/tracker/PoseView.cpp
	src/preferences/appearance/DecorSettingsView.cpp
	src/preferences/virtualmemory/Settings.cpp
	src/servers/input/AddOnManager.cpp
	src/servers/input/InputServer.cpp
	src/servers/input/InputServerMethod.cpp
	src/system/boot/Jamfile
	src/system/boot/platform/raspberrypi_arm/mmu.cpp
	src/system/boot/platform/u-boot/arch/arm/Jamfile
	src/system/kernel/arch/x86/arch_cpu.cpp
	src/system/kernel/arch/x86/arch_thread.cpp
	src/system/kernel/cache/block_cache.cpp
	src/system/kernel/vm/VMAnonymousCache.cpp
2012-11-18 14:02:07 +00:00
..
build Convert fs_host files from c back to cpp and style changes. 2012-08-13 18:51:59 -04:00
compatibility Drop "protected"-define from bsd-compatibility header 2012-11-05 09:37:55 +01:00
config Merge branch 'master' into x86_64 2012-08-16 21:11:15 +01:00
cpp Allow use of c_str() on wstring. 2012-10-27 17:14:55 +02:00
glibc * merged 32bit-wchar_t branches of buildtools and haiku back into 2009-07-07 10:30:09 +00:00
libs Merge branch 'master' into x86_64 2012-11-18 14:02:07 +00:00
os Merge branch 'master' into x86_64 2012-11-18 14:02:07 +00:00
posix Merge branch 'master' into x86_64 2012-11-18 14:02:07 +00:00
private Merge branch 'master' into x86_64 2012-11-18 14:02:07 +00:00
tools * Moved everything into the SymbolPatcher namespace. 2009-11-05 17:16:17 +00:00