Merge branch 'master' into dev/Configurables
Conflicts: GaudiKernel/cmt/requirements GaudiKernel/src/Lib/Property.cpp GaudiKernel/src/Util/genconf.cpp
.gitignore
0 → 100644
Conflicts: GaudiKernel/cmt/requirements GaudiKernel/src/Lib/Property.cpp GaudiKernel/src/Util/genconf.cpp