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
boot_cd
catalogs	Update translations from Pootle	2013-07-06 06:14:11 +02:00
common
config/boot
develop
etc
image_directories
settings
system