Ingo Weinhold 19ae20e67e Merge branch 'master' into pm-flat ... Conflicts: build/jam/HaikuImage build/jam/OptionalBuildFeatures build/jam/OptionalPackages build/jam/UserBuildConfig.sample data/bin/installoptionalpackage src/apps/deskbar/DeskbarMenu.cpp src/servers/debug/DebugServer.cpp src/system/kernel/fs/vfs.cpp		2011-11-05 17:00:01 +01:00
..
build	Fix build due to <directories.h> move	2011-07-17 16:55:22 +02:00
compatibility	* Added definitions for n_short, n_long, and n_time as expected on FreeBSD when	2011-07-23 15:41:47 +00:00
config	Flat commit of all changes from package-management branch in svn	2011-07-17 16:54:06 +02:00
cpp	Fix #7948: add correct prototype for String::compare alongside the wrong one	2011-10-31 09:56:00 +00:00
glibc	* merged 32bit-wchar_t branches of buildtools and haiku back into	2009-07-07 10:30:09 +00:00
libs	* Added bool and double BString::operator<<() versions.	2011-07-07 10:17:15 +00:00
os	Merge branch 'master' into pm-flat	2011-11-05 17:00:01 +01:00
posix	Rename some parameters to avoid "declaration of 'foo' shadows global declaration" warnings.	2011-10-31 22:01:29 +00:00
private	Merge branch 'master' into pm-flat	2011-11-05 17:00:01 +01:00
tools	* Moved everything into the SymbolPatcher namespace.	2009-11-05 17:16:17 +00:00