Ingo Weinhold c663ca2171 Merge branch 'master' into package-management ... Conflicts: build/jam/HaikuImage src/system/kernel/arch/x86/64/arch.S		2013-05-12 00:18:19 +02:00
..
artwork	Committed changed Pe and sourcecode icons. (#9518)	2013-03-11 20:14:22 +01:00
bin	Merge branch 'master' into package-management	2013-05-05 15:03:26 +02: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	2013-05-11 06:16:58 +02:00
common	Remove the no longer needed mime_update.sh post install script	2013-05-09 03:43:58 +02:00
config/boot	Move ~/config/boot to ~/config/settings/	2013-05-11 09:57:57 +02:00
develop	Support x86_64 platform in makefile-engine	2013-01-09 21:51:44 +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 package-management	2013-05-12 00:18:19 +02:00