Projects/AthSimulation/externals.txt · 5390a9debe3f17b557effb395a9d993387414e86 · Peter Sherwood / athena

Forked from atlas / athena

Source project has a limited visibility.

7 years ago

Merge remote branch 'upstream/master' into ExternalsUpdateForQt-master-20170615 · a7158d1d

Attila Krasznahorkay authored 7 years ago

Conflicts:
	Projects/AthSimulation/externals.txt
	Projects/Athena/externals.txt

Resolved two minor conflicts in Athena/externals.txt and AthSimulation/externals.txt.
At the same time updated the externals.txt files a bit to try to prevent similar
conflicts to appear in the future. (By moving the "changable" lines in the files
a bit further apart.)


Former-commit-id: a9017398

a7158d1d

History

Merge remote branch 'upstream/master' into ExternalsUpdateForQt-master-20170615

Attila Krasznahorkay authored 7 years ago

Conflicts:
	Projects/AthSimulation/externals.txt
	Projects/Athena/externals.txt

Resolved two minor conflicts in Athena/externals.txt and AthSimulation/externals.txt.
At the same time updated the externals.txt files a bit to try to prevent similar
conflicts to appear in the future. (By moving the "changable" lines in the files
a bit further apart.)


Former-commit-id: a9017398

Code owners

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