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
..
build	Refactor reusable pkgman code into libpackage	2013-08-31 21:19:07 +02:00
compatibility	Drop "protected"-define from bsd-compatibility header	2012-11-05 09:37:55 +01:00
config	Merge branch 'master' into x86_64	2012-08-16 21:11:15 +01:00
cpp	Allow use of c_str() on wstring.	2012-10-27 17:14:55 +02:00
glibc	Make public glibc header printf.h usable.	2013-07-17 18:07:56 +02:00
libs	Merge remote-tracking branch 'haiku/master' into package-management	2013-07-08 14:01:00 +02:00
os	Add support for adding a package-info to BRepositoryWriter.	2013-09-18 12:05:34 +02:00
posix	Merge remote-tracking branch 'haiku/master' into package-management	2013-09-27 01:55:45 +02:00
private	Merge remote-tracking branch 'haiku/master' into package-management	2013-09-27 01:55:45 +02:00
tools	* Moved everything into the SymbolPatcher namespace.	2009-11-05 17:16:17 +00:00