Skip to content
Snippets Groups Projects

GAUDI-978: merge hive branch into master

Merged GAUDI-978: merge hive branch into master
hive into master
Merged Marco Clemencic requested to merge hive into master
Viewing commit c7c787c7
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
289
  • c7c787c7 
    Conflicts:
	GaudiAlg/src/lib/GaudiCommon.icpp
	GaudiAlg/src/lib/GaudiTool.cpp
	GaudiCoreSvc/src/ApplicationMgr/ApplicationMgr.cpp
	GaudiCoreSvc/src/JobOptionsSvc/JobOptionsSvc.cpp
	GaudiExamples/CMakeLists.txt
	GaudiExamples/tests/qmtest/refs/Aida2Root.ref
	GaudiExamples/tests/qmtest/refs/AlgTools.ref
	GaudiExamples/tests/qmtest/refs/AlgTools2.ref
	GaudiExamples/tests/qmtest/refs/AlgTools_pyopts.ref
	GaudiExamples/tests/qmtest/refs/EvtColsEx/Write.ref
	GaudiExamples/tests/qmtest/refs/GaudiCommonTests.ref
	GaudiExamples/tests/qmtest/refs/Histograms.ref
	GaudiExamples/tests/qmtest/refs/ROOT_IO/ExtCollWrite.ref
	GaudiExamples/tests/qmtest/refs/conditional_output/write.ref
	GaudiKernel/GaudiKernel/implements.h
	GaudiKernel/doc/release.notes
	GaudiKernel/src/Lib/Algorithm.cpp
	GaudiKernel/src/Lib/MsgStream.cpp
	GaudiRelease/doc/release.notes