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

..

build

Add BDriverSettings to libbe_build

2013-07-06 02:11:18 +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

…

libs

Merge remote-tracking branch 'haiku/master' into package-management

2013-07-08 14:01:00 +02:00

os

Merge remote-tracking branch 'haiku/master' into package-management

2013-07-08 14:01:00 +02:00

posix

<langinfo.h>/<select.h>: don't use C++ comments

2013-06-12 14:55:16 +02:00

private

Merge remote-tracking branch 'haiku/master' into package-management

2013-07-08 14:01:00 +02:00

tools

…