Merge remote-tracking branch 'haiku/master' into package-management
This reverts 8f7f28a7c3db28711920ad5d15df401fae90bcf1 (OpenGL: Upgrade to Mesa 9.2).
Conflicts: build/jam/BuildFeatures build/j
Merge remote-tracking branch 'haiku/master' into package-management
This reverts 8f7f28a7c3db28711920ad5d15df401fae90bcf1 (OpenGL: Upgrade to Mesa 9.2).
Conflicts: build/jam/BuildFeatures build/jam/HaikuImage build/jam/OptionalPackages build/scripts/build_cross_tools_gcc4 src/add-ons/opengl/swpipe/Jamfile src/apps/diskusage/Jamfile src/kits/tracker/ContainerWindow.cpp src/kits/tracker/DeskWindow.cpp src/kits/tracker/Jamfile
show more ...
|