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
..
2013-06-29 13:18:52 -05:00
2013-06-27 21:57:43 +02:00
2013-06-29 13:42:00 +02:00
2013-06-07 18:00:17 +02:00