Merge remote-tracking branch 'haiku/master' into package-management
Conflicts:
build/jam/HaikuImage
build/jam/OptionalPackageDependencies
build/jam/OptionalPackages
build/scripts/build_cross_too
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
show more ...
|