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
bin	Merge branch 'master' into package-management	2013-05-05 15:03:26 +02:00
boot_cd
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
etc
image_directories
settings
system	Merge branch 'master' into package-management	2013-05-12 00:18:19 +02:00