]> git.uio.no Git - u/mrichter/AliRoot.git/commit - PWG/EMCAL/macros/AddTaskEmcalSetup.C
Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Tue, 26 Aug 2014 10:31:32 +0000 (12:31 +0200)
committermivanov <marian.ivanov@cern.ch>
Tue, 26 Aug 2014 10:31:32 +0000 (12:31 +0200)
commit52fb4b3479168093e89faf9e8ac289312be1b26e
tree3d66fc7be44c65c104fdb7ce9060523383b8d76e
parentd37a7dc4f8d4b0010f8225e1f2d954a0b4c2962e
parent5d1391ecca3ac11d51a597b9180adc3f6f79853f
Merge branch 'master' into TPCdev

Conflicts:
TPC/Calib/AliTPCcalibAlign.cxx
TPC/Calib/AliTPCcalibAlign.h
STEER/ESD/AliESDtrack.cxx
STEER/ESD/AliESDtrack.h
TPC/Base/AliTPCcalibDButil.cxx
TPC/Calib/AliTPCcalibAlign.cxx