Ingo Weinhold 7e78b434f4 Merge remote-tracking branch 'haiku/master' into package-management ... Conflicts: build/jam/HaikuImage build/jam/OptionalPackageDependencies build/jam/OptionalPackages build/scripts/build_cross_tools_gcc4 src/add-ons/translators/icns/Jamfile src/add-ons/translators/jpeg/Jamfile		2013-07-08 14:01:00 +02:00
..
artwork	Add virtual directory feature to Tracker	2013-06-29 14:58:51 +02:00
bin	Update freetype package	2013-06-14 00:48:10 +02:00
boot_cd	PowerPC: Expand compatible platforms	2013-06-13 14:03:49 -05:00
catalogs	Update translations from Pootle	2013-07-06 06:14:11 +02:00
common	add_catalog_entry_attributes.sh: Remove optional directory	2013-06-05 00:18:38 +02:00
config/boot	Move ~/config/boot to ~/config/settings/	2013-05-11 09:57:57 +02:00
develop	Jamfile/makefile-engines:replace -nostart with -shared	2013-05-26 12:42:46 +02:00
etc	ls: Change color scheme for other writable directory (#4494)	2012-10-21 14:53:45 +02:00
image_directories
settings	Removing the acpi_avoid_full_init config option.	2012-09-09 13:13:53 +02:00
system	Remove /boot/{apps,preferences} symlinks	2013-06-04 23:36:46 +02:00