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