Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sun, 12 Oct 2014 09:32:33 +0000 (11:32 +0200)
committermivanov <marian.ivanov@cern.ch>
Sun, 12 Oct 2014 09:32:33 +0000 (11:32 +0200)
commitd1f493e4c13b190e243a3fcbcc0a67f3e64382f7
tree98dc5b635a3c393de6780ee583cb017da06bf527
parentd5aded0ab972ca79d4c4dcdc29ca6f9941aa1cc8
parent9a9245719eb515396676d4919f34a7a3e30b664f
Merge branch 'master' into TPCdev
STEER/CDB/AliCDBManager.h
STEER/ESD/AliESDtrack.cxx
STEER/STEER/AliSimulation.cxx
TPC/Base/AliTPCcalibDB.cxx