Code/Mantid/Framework/Kernel/src/InternetHelper.cpp · b83a9517a6f707e541b72528999c1726b76c3071 · mantidproject / mantid

10 years ago

Merge branch 'master' into feature/10591_scarf_reconstruction · b83a9517

Federico Montesino Pouzols authored 10 years ago

Conflicts:
	Code/Mantid/Framework/Kernel/inc/MantidKernel/InternetHelper.h
	Code/Mantid/Framework/Kernel/src/InternetHelper.cpp

Smallish conflicts after changes in inet helper, re #10591

b83a9517

History

Merge branch 'master' into feature/10591_scarf_reconstruction

Federico Montesino Pouzols authored 10 years ago

Conflicts:
	Code/Mantid/Framework/Kernel/inc/MantidKernel/InternetHelper.h
	Code/Mantid/Framework/Kernel/src/InternetHelper.cpp

Smallish conflicts after changes in inet helper, re #10591

Code owners

Assign users and groups as approvers for specific file changes. Learn more.