Skip to content
Snippets Groups Projects
Commit 8f15f19c authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Merge branch 'master' into dev/Configurables 

Conflicts:
	GaudiKernel/cmt/requirements
	GaudiKernel/src/Lib/Property.cpp
	GaudiKernel/src/Util/genconf.cpp
parents ae9209da 9aa26c56
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 659 additions and 564 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