Skip to content
Snippets Groups Projects
Commit 11806ba2 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Merged in the latest changes from the master branch. Resolving two conflicts... 

Merged in the latest changes from the master branch. Resolving two conflicts that arose in GaudiAlg and GaudiKernel.

Had to turn off the build of the new files in GaudiExamples/src/FunctionalAlgorithms/ when the Ranges_v3 headers are not available.
parents edbf2a8a 9e24ed98
No related branches found
No related tags found
1 merge request!241CMake configuration changes to build Gaudi with optional externals missing
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 897 additions and 210 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment