Ingo Weinhold 81291304ad Merge remote-tracking branch 'haiku/master' into package-management ... Conflicts: build/jam/BuildSetup build/jam/HaikuImage build/jam/board/sam460ex/BoardSetup build/jam/board/verdex/BoardSetup data/catalogs/apps/icon-o-matic/fr.catkeys src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp src/apps/debugger/files/FileManager.cpp src/apps/debugger/files/FileManager.h src/apps/debugger/user_interface/gui/inspector_window/MemoryView.cpp src/apps/haiku-depot/MainWindow.cpp src/apps/haiku-depot/MainWindow.h src/apps/haiku-depot/Model.cpp src/apps/haiku-depot/PackageInfo.h src/apps/haiku-depot/PackageInfoListener.h src/apps/haiku-depot/PackageInfoView.cpp src/apps/haiku-depot/PackageInfoView.h src/apps/haiku-depot/PackageListView.cpp src/apps/haiku-depot/PackageListView.h src/system/kernel/arch/arm/arch_timer.cpp src/system/libroot/os/arch/arm/atomic.S src/tools/translation/bitsinfo/Jamfile src/tools/translation/bmpinfo/Jamfile src/tools/translation/tgainfo/Jamfile		2013-09-27 01:55:45 +02:00
..
artwork	Add virtual directory feature to Tracker	2013-06-29 14:58:51 +02:00
bin	Remove setgcc	2013-08-12 15:53:50 +02:00
boot_cd	PowerPC: Expand compatible platforms	2013-06-13 14:03:49 -05:00
catalogs	Update translations from Pootle	2013-09-21 06:13:38 +02:00
common	add_catalog_entry_attributes.sh: Remove optional directory	2013-06-05 00:18:38 +02:00
config/boot
develop	Jamfile/makefile-engines:replace -nostart with -shared	2013-05-26 12:42:46 +02:00
etc
image_directories
settings
system	Remove /boot/{apps,preferences} symlinks	2013-06-04 23:36:46 +02:00