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
..
artwork	Updated graphics for r1a4.	2012-09-03 10:50:14 +00:00
bin	Fix installoptionalpackage for OpenSSL and Webkit	2012-11-03 13:41:04 +01:00
boot_cd	Applied patch by Karvjorm to make the HTML xhtml strict compliant. Fixes #6197. Thanks!	2010-07-04 05:32:10 +00:00
catalogs	Update translations from Pootle	2012-08-18 06:30:34 +02:00
common	Fix ticket #8858.	2012-08-11 09:56:20 -04:00
config/boot	Remove useless if, /bin/open will handle this itself. Thanks Rene and sorry for	2009-08-20 20:15:39 +00:00
develop	Localization support added into Jamfile-engine.	2011-11-28 13:16:28 +01:00
etc	ls: Change color scheme for other writable directory (#4494)	2012-10-21 14:53:45 +02:00
image_directories	Reverted r35043. The "Save as PDF" printer could not save to	2010-03-14 15:40:18 +00:00
settings	Removing the acpi_avoid_full_init config option.	2012-09-09 13:13:53 +02:00
system	Merge branch 'master' into x86_64	2012-08-16 21:11:15 +01:00