haiku/build
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
..
config_headers Replaced mention of "SVN" with "version control system". 2011-12-04 14:51:47 +01:00
jam Merge remote-tracking branch 'haiku/master' into package-management 2013-07-08 14:01:00 +02:00
scripts Move package info pre-processing to jam build system 2013-07-07 15:02:29 +02:00